]> 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, 19 Sep 2011 06:57:45 +0000 (16:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Sep 2011 06:57:45 +0000 (16:57 +1000)
commit6ef56d2e8489c2f32e369def9f588182280cf984
treed43b96e21b0befe289d2d9f7547826295dfbfd5d
parenta054fe64e1a70ed47b4e3dfda32e49640eba8c81
parent79787f21b37b2cd359689384239bc5385aef9298
Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
drivers/of/base.c