]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'devicetree/devicetree/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2011 04:43:04 +0000 (14:43 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2011 04:43:04 +0000 (14:43 +1000)
commit7bce94bdbe09bf7ec6a746c3c19064c76ae22d79
tree7ed285582cee9bbb93fa3d7d8c5b37ce171ce5ba
parent5b0e08f1c0c6db1c0ec5bf6eaa1b4f2681ad0c72
parent79787f21b37b2cd359689384239bc5385aef9298
Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
drivers/of/base.c