Merge branch 'imx' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 10 Jul 2008 15:41:50 +0000 (16:41 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 10 Jul 2008 15:41:50 +0000 (16:41 +0100)
commitf0006314d37639714da9658cf4ff3f1f9f420764
treeb8a18e014a40f2f8fd5148aab09c869dfaabd7a9
parenta177ba3b7a08beef3f0fe74efa0f90701891945a
parent1bd55a436f1f90de0e7f476e514e01bd67497b88
Merge branch 'imx' into devel

Conflicts:

arch/arm/mm/Kconfig
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mm/Kconfig
drivers/mmc/host/imxmmc.c
drivers/serial/Kconfig
drivers/spi/spi_imx.c
kernel/hrtimer.c