Merge bk://dsaxena.bkbits.net/linux-2.6-for-rmk

author Russell King <rmk@flint.arm.linux.org.uk>

Thu, 13 May 2004 15:05:27 +0000 (16:05 +0100)

committer Russell King <rmk@flint.arm.linux.org.uk>

Thu, 13 May 2004 15:05:27 +0000 (16:05 +0100)
author Russell King <rmk@flint.arm.linux.org.uk>
Thu, 13 May 2004 15:05:27 +0000 (16:05 +0100)
committer Russell King <rmk@flint.arm.linux.org.uk>
Thu, 13 May 2004 15:05:27 +0000 (16:05 +0100)
diff --cc arch/arm/kernel/debug.S
Simple merge
diff --cc arch/arm/kernel/entry-armv.S
Simple merge
author	Russell King <rmk@flint.arm.linux.org.uk>
	Thu, 13 May 2004 15:05:27 +0000 (16:05 +0100)
committer	Russell King <rmk@flint.arm.linux.org.uk>
	Thu, 13 May 2004 15:05:27 +0000 (16:05 +0100)
		1	2
arch/arm/kernel/debug.S	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/entry-armv.S	patch \|	diff1 \|	diff2 \|	blob \| history