Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 15 Dec 2008 22:13:26 +0000 (22:13 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 15 Dec 2008 22:13:26 +0000 (22:13 +0000)
commit7e1548a597ef7e26d5d62f8be3be6da9e101b26c
treefe6cbf4d9a3c1afdba04fb276fef0f932403727c
parent1f7f569c0ae6e619504095eabf796edd712d943d
parent2619bc327417f549f1c89d5ef9b4a4aa768f41a2
Merge branch 'omap3-upstream' of git://git./linux/kernel/git/tmlind/linux-omap-2.6 into devel
arch/arm/include/asm/processor.h
arch/arm/mm/alignment.c
arch/arm/plat-omap/dma.c
drivers/ide/Kconfig
drivers/mtd/nand/pxa3xx_nand.c