tree 80dc082c1f256c481f152a62c74605c8962251a6
parent 455ce9d8410d381f56a1676449a723ca1985b369
parent fe55c1844a1c106e9d9d3dd27cbfcf8caeb9e77e
author Linus Torvalds <torvalds@linux-foundation.org> 1312475827 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1312475827 -1000

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