diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 20:25:57 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 20:25:57 (GMT) |
| commit | fce519588acfac249e8fdc1f5016c73d617de315 (patch) | |
| tree | bea37c564c552cf69344c3bab7156308df7de662 /fs/ocfs2/dir.c | |
| parent | 7103dbed8e462f2a065381d23fde086cbd5b9891 (diff) | |
| parent | b1608d69cb804e414d0887140ba08a9398e4e638 (diff) | |
| download | linux-fsl-qoriq-fce519588acfac249e8fdc1f5016c73d617de315.tar.xz | |
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
drivercore: revert addition of of_match to struct device
of: fix race when matching drivers
Diffstat (limited to 'fs/ocfs2/dir.c')
0 files changed, 0 insertions, 0 deletions