]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'devicetree/devicetree/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 5 Aug 2011 02:13:39 +0000 (12:13 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 5 Aug 2011 02:13:39 +0000 (12:13 +1000)
commit6bf444d9841ab03ff0c84096ded384070cfd8141
tree37447b65251bb0f32456e5a9c61ce6a9d6028977
parent6b4fac5cc727f705073a33721269095ed8cc7a2d
parent79787f21b37b2cd359689384239bc5385aef9298
Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
drivers/of/base.c