]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'devicetree/devicetree/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 02:16:46 +0000 (12:16 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 02:16:46 +0000 (12:16 +1000)
commit300bed5ba9a5851d4e3885134b1dd5cd25d475ef
treef45ee9445811f607f53b4899c4eb0a51910f12a9
parent3a22c24e9ae5c5d1dd63c5e086855a275c624615
parent79787f21b37b2cd359689384239bc5385aef9298
Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
drivers/of/base.c