From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Aug 2011 04:59:09 +0000 (-0700)
Subject: Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.1-rc2~13
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=73e0881d31406acc09eb11fa073108b43c89124e;p=linux.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:
  dt: add empty of_get_property for non-dt
---

73e0881d31406acc09eb11fa073108b43c89124e