]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'devicetree/devicetree/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 04:17:38 +0000 (14:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 04:17:38 +0000 (14:17 +1000)
commit5d76614087a4958f731310e4b997b2920fd72ebe
treeadb1b11e76980b7fc1b1db7fed1660037b0b3d2b
parent2620b70cc470d30b05b540185a198015592f69a3
parent79787f21b37b2cd359689384239bc5385aef9298
Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
drivers/of/base.c