]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 22:56:48 +0000 (09:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 22:56:48 +0000 (09:56 +1100)
commit2b731ff5249cc49a5ec2af9636df5ba58103bebd
tree2ca1bf62683b6184abc6827d75846d19cbfff7e2
parent5e510e366491aa07c9cb2b32766b51f0c3003fa4
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