]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-soc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 02:06:25 +0000 (12:06 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 02:06:25 +0000 (12:06 +1000)
commit9db129f74028ae6b0c4256a16e50321cfedd7251
treeb93d1443d8aa0bbcba35c3612051ee40990afee4
parente40ee857b6c8102f5bea73ad882fc62805efb4d8
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