tree e2a3811677d3594e891fc82c940438f6b6abc3e0
parent 2631182bf93919577730e6a6c4345308db590057
parent 85d6943af50537d3aec58b967ffbd3fec88453e9
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1244730900 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1244730900 +0100

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