summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-19 00:25:57 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-19 00:25:57 +0400
commitfce519588acfac249e8fdc1f5016c73d617de315 (patch)
treebea37c564c552cf69344c3bab7156308df7de662 /fs
parent7103dbed8e462f2a065381d23fde086cbd5b9891 (diff)
parentb1608d69cb804e414d0887140ba08a9398e4e638 (diff)
downloadlinux-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')
0 files changed, 0 insertions, 0 deletions