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)
commit59b69e27ca9f6c6347b1ec07066a9250140cb9e8
treed8ea8948c92bdfc7f3bdfc03a7b789243ffbaaa8
parent9c5e8fecc4a86adbf363f5cf344c0ccccdbb8982
parentee2b805c8eb6459cf541ef141ff70dae17af59ca
Merge branch 'u300' into devel
arch/arm/mach-u300/core.c
arch/arm/mach-u300/mmc.c
drivers/spi/amba-pl022.c