Merge branch 'merge-fixes' into devel
commitcf816ecb533ab96b883dfdc0db174598b5b5c4d2
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 19 Apr 2008 16:17:34 +0000 (19 17:17 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 19 Apr 2008 16:17:34 +0000 (19 17:17 +0100)
tree1b7705db288ae2917105e624b01fdf81e0882bf1
parentadf6d34e460387ee3e8f1e1875d52bff51212c7d
parent15f7d677ccff6f0f5de8a1ee43a792567e9f9de9
Merge branch 'merge-fixes' into devel
MAINTAINERS
arch/arm/kernel/Makefile
drivers/ata/sata_mv.c
drivers/net/Kconfig
drivers/serial/imx.c