Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 11 Jun 2009 14:35:00 +0000 (15:35 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 11 Jun 2009 14:35:00 +0000 (15:35 +0100)
commit42578c82e0f1810a07ebe29cb05e874893243d8c
treee2a3811677d3594e891fc82c940438f6b6abc3e0
parent2631182bf93919577730e6a6c4345308db590057
parent85d6943af50537d3aec58b967ffbd3fec88453e9
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel

Conflicts:
arch/arm/Kconfig
arch/arm/kernel/smp.c
arch/arm/mach-realview/Makefile
arch/arm/mach-realview/platsmp.c
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/kernel/entry-armv.S
arch/arm/kernel/smp.c
arch/arm/mach-realview/Kconfig
arch/arm/mach-realview/Makefile
arch/arm/mach-realview/platsmp.c
arch/arm/mm/Kconfig