Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Aug 2011 01:10:30 +0000 (15:10 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Aug 2011 01:10:30 +0000 (15:10 -1000)
commit27665ffa22b9b83bab226bf12c61424f7f1f8995
treeaaccc030778bb6878c46ab9ca035901af67d78e4
parent14595f708eeb528fabcee339ed0b9e0a2ecec73f
parent750f463a749e28464151ad26938d11b07b1c43cb
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