From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Aug 2011 01:10:30 +0000 (-1000)
Subject: Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.1-rc1~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27665ffa22b9b83bab226bf12c61424f7f1f8995;p=thirdparty%2Flinux.git

Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6

* 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6:
  dt: add of_alias_scan and of_alias_get_id
---

27665ffa22b9b83bab226bf12c61424f7f1f8995