Merge branch 'u300' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 Sep 2009 15:03:13 +0000 (16:03 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 Sep 2009 15:03:13 +0000 (16:03 +0100)
1  2 
arch/arm/mach-u300/core.c
arch/arm/mach-u300/mmc.c
drivers/spi/amba-pl022.c

Simple merge
Simple merge
Simple merge