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)
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
  dt: add empty of_get_property for non-dt


Trivial merge