From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 May 2011 20:25:57 +0000 (-0700)
Subject: Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=fce519588acfac249e8fdc1f5016c73d617de315;p=linux-edison.git

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
---

fce519588acfac249e8fdc1f5016c73d617de315