]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-soc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 23:46:54 +0000 (09:46 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 23:46:54 +0000 (09:46 +1000)
commit70c273d1fe7addc6b9dab009ea72f428efba742f
treeb84ce30782d3228c4aad3c009a12df08706e74de
parent84aa4bbc45bad7dc5c3dcc6af853cb7f8d52bb50
parent364661d7ef9d2702222cad2b8fb10a91f2b0e882
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/mach-u300/Makefile.boot
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-u300/Makefile.boot