]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commita28154251594b85d439793304011d90e3c6047b8
treeb8a18e014a40f2f8fd5148aab09c869dfaabd7a9
parent3db5d05805e572bcdcad9321ff535025c4bd4919
parent58ce75091e3ff014259a52c2cb7b5a76974227ae
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