Merge branch 'merge-fixes' into devel

author Russell King <rmk@dyn-67.arm.linux.org.uk>

Sat, 19 Apr 2008 16:17:34 +0000 (17:17 +0100)

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

Sat, 19 Apr 2008 16:17:34 +0000 (17:17 +0100)
author Russell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 19 Apr 2008 16:17:34 +0000 (17:17 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Sat, 19 Apr 2008 16:17:34 +0000 (17:17 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/kernel/Makefile
Simple merge
diff --cc drivers/ata/sata_mv.c
Simple merge
diff --cc drivers/net/Kconfig
Simple merge
diff --cc drivers/serial/imx.c
Simple merge
author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Sat, 19 Apr 2008 16:17:34 +0000 (17:17 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Sat, 19 Apr 2008 16:17:34 +0000 (17:17 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/ata/sata_mv.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/serial/imx.c	patch \|	diff1 \|	diff2 \|	blob \| history