Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Aug 2011 16:37:07 +0000 (06:37 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Aug 2011 16:37:07 +0000 (06:37 -1000)
commit53d1e658df6e26d62500410719aaee2b82067c03
tree80dc082c1f256c481f152a62c74605c8962251a6
parent455ce9d8410d381f56a1676449a723ca1985b369
parentfe55c1844a1c106e9d9d3dd27cbfcf8caeb9e77e
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