]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'devicetree/devicetree/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Aug 2011 01:11:56 +0000 (11:11 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Aug 2011 01:11:56 +0000 (11:11 +1000)
commit38926eef90c563e30762c8bd44d7147123bb1f6f
tree4106ff8d0d813286f040efe2175102241f484344
parentf94249d0c7d3458d9ebb31784afbf02ff11d4cec
parent79787f21b37b2cd359689384239bc5385aef9298
Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
drivers/of/base.c