]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'devicetree/devicetree/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 15 Sep 2011 04:48:39 +0000 (14:48 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 15 Sep 2011 04:48:39 +0000 (14:48 +1000)
commite09f31d142a3809faa673194a47cf398e1d001df
treefec12d4cd205c4f61bba3fbf11221307df3668e5
parent40dc374a77a8bdcf3ebad2c7d5ab4a12a1eea682
parent79787f21b37b2cd359689384239bc5385aef9298
Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
drivers/of/base.c