]> 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, 9 Sep 2011 04:49:48 +0000 (14:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 04:49:48 +0000 (14:49 +1000)
commitfabc2a8658686c78e3086bdf4fa7a191db886f7c
treef2d4693ff003a8fbbc00c1c30bb00ea41a6c4430
parent0ef20cc7a9c5620d53c2890d7ecfda9870828f1d
parent79787f21b37b2cd359689384239bc5385aef9298
Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
drivers/of/base.c