Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Aug 2011 04:59:09 +0000 (21:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Aug 2011 04:59:09 +0000 (21:59 -0700)
commit73e0881d31406acc09eb11fa073108b43c89124e
tree8195f49c5f1b7e06caf3df36b4a1882902a83277
parente211bc8d96d45799cab1be46f4367327d5f629ba
parent89272b8c0d427021bed70b1b83e1a16be375ccf5
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6

* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
  dt: add empty of_get_property for non-dt