]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'devicetree/devicetree/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 01:51:15 +0000 (11:51 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 01:51:15 +0000 (11:51 +1000)
commit08009c776e3988cd3a4715c5e847c4d00e379264
treef82202918197c84044464b818f6011aa1145b92a
parent07885bff12416eaf14e32771e9e8f5ea8bbd03bd
parent79787f21b37b2cd359689384239bc5385aef9298
Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
drivers/of/base.c