]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'misc' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 1 Oct 2011 16:56:02 +0000 (17:56 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 1 Oct 2011 16:56:02 +0000 (17:56 +0100)
commit88122a8bf85fedb1e9485b48861c3134326f39fa
tree876cd788c8a7c5463f56ad5b1ac1f2d0eec49035
parent9ad4258ff321483892e4aa8888086b2e54cf3587
parenta1a4d38452d786374c83e94cf326422c0ba18b70
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