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)
* '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


Trivial merge