]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'misc' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 26 Sep 2011 12:34:05 +0000 (13:34 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 26 Sep 2011 12:34:05 +0000 (13:34 +0100)
commitc1e11e33c1523326ce6cd5e81c366a074cdf4609
tree46732edc90de63398d79af14437d3686b2ca6470
parent5eddd37d68a74a394921f4c52769e48dbdcf8c05
parent6919f67f9c8b48489d5240e0d3714bc6ab91ec81
Merge branch 'misc' into for-next

Conflicts:
arch/arm/mach-integrator/integrator_ap.c
arch/arm/Kconfig
arch/arm/kernel/smp_scu.c
arch/arm/kernel/vmlinux.lds.S
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-mmp/aspenite.c
arch/arm/mach-msm/board-sapphire.c
arch/arm/mach-sa1100/Makefile