Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 May 2011 20:25:57 +0000 (13:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 May 2011 20:25:57 +0000 (13:25 -0700)
commitfce519588acfac249e8fdc1f5016c73d617de315
treebea37c564c552cf69344c3bab7156308df7de662
parent7103dbed8e462f2a065381d23fde086cbd5b9891
parentb1608d69cb804e414d0887140ba08a9398e4e638
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