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)
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge