]> 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, 5 Sep 2011 05:38:01 +0000 (15:38 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 05:38:01 +0000 (15:38 +1000)
commit6877a033de7fe3baafeaf96ac4d2466ce0ea9ab5
tree4b288e70a620a46c3e8b7cee759d0a7d7439e34e
parent016c3fdab7138b6d0286b0e7ccb46777abe78280
parent79787f21b37b2cd359689384239bc5385aef9298
Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
drivers/of/base.c