Merge flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5

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

Thu, 4 Apr 2002 10:45:09 +0000 (11:45 +0100)

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

Thu, 4 Apr 2002 10:45:09 +0000 (11:45 +0100)
author Russell King <rmk@flint.arm.linux.org.uk>
Thu, 4 Apr 2002 10:45:09 +0000 (11:45 +0100)
committer Russell King <rmk@flint.arm.linux.org.uk>
Thu, 4 Apr 2002 10:45:09 +0000 (11:45 +0100)
diff --cc arch/arm/kernel/armksyms.c
Simple merge
diff --cc drivers/net/irda/sa1100_ir.c
Simple merge
author	Russell King <rmk@flint.arm.linux.org.uk>
	Thu, 4 Apr 2002 10:45:09 +0000 (11:45 +0100)
committer	Russell King <rmk@flint.arm.linux.org.uk>
	Thu, 4 Apr 2002 10:45:09 +0000 (11:45 +0100)
		1	2
arch/arm/kernel/armksyms.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/irda/sa1100_ir.c	patch \|	diff1 \|	diff2 \|	blob \| history