]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'devicetree/devicetree/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 18 Aug 2011 03:51:37 +0000 (13:51 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 18 Aug 2011 03:51:37 +0000 (13:51 +1000)
commita3fa08f2c4f2de5002219add4930341c69becca5
treed15cfec84630d2c6294bce995d870c4ecfc2cec9
parent19d61cd83a55936f4a052d421e2372717d764a41
parent79787f21b37b2cd359689384239bc5385aef9298
Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
drivers/of/base.c