]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 23:27:53 +0000 (10:27 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 23:27:53 +0000 (10:27 +1100)
commitfff6a3a2db8200bf1859568ebed0a53ec7c4d1b9
tree22f42117c49cb5afc77e63b0c2578a683945c2bd
parent40375ac99998a957e670efd2e941c2411506a9bc
parentf537d068a864d26708786f64307c962ee2731ab4
Merge remote-tracking branch 'arm/for-next'

Conflicts:
arch/arm/kernel/smp.c
arch/arm/kernel/Makefile
arch/arm/kernel/head.S
arch/arm/kernel/setup.c
arch/arm/kernel/smp.c