Merge branch 'merge-fixes' into devel
Russell King [Sat, 19 Apr 2008 16:17:34 +0000 (17:17 +0100)]
1  2 
MAINTAINERS
arch/arm/kernel/Makefile
drivers/ata/sata_mv.c
drivers/net/Kconfig
drivers/serial/imx.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge