tree bea37c564c552cf69344c3bab7156308df7de662
parent 7103dbed8e462f2a065381d23fde086cbd5b9891
parent b1608d69cb804e414d0887140ba08a9398e4e638
author Linus Torvalds <torvalds@linux-foundation.org> 1305750357 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1305750357 -0700

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