From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Aug 2011 16:37:07 +0000 (-1000)
Subject: Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.1-rc1~32
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=53d1e658df6e26d62500410719aaee2b82067c03;p=users%2Fwilly%2Flinux.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:
  Revert "dt: add of_alias_scan and of_alias_get_id"
  dt: remove of_alias_get_id() reference
---

53d1e658df6e26d62500410719aaee2b82067c03