]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitd21ccb94eae446854642bec7bcbb7001bf9cd54d
tree80dc082c1f256c481f152a62c74605c8962251a6
parent2e8a45e70dd88dcc254393d6f7a511e0450a8880
parent014329fd9ffdec22f2ed7358f0d5a47c7cd71e0f
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