diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 19:08:31 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 19:08:31 +0100 |
commit | aa312be1987d43216e72ffce42bccf6bf81f62ed (patch) | |
tree | b994c25fc1492d7ff70d2ca83c64106b4883a808 /arch/arm/mach-integrator | |
parent | Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'ver... (diff) | |
parent | ARM: mmci: Clean up MMCI announcement printk (diff) | |
parent | ARM: PL011: add DMA burst threshold support for ST variants (diff) | |
download | linux-aa312be1987d43216e72ffce42bccf6bf81f62ed.tar.xz linux-aa312be1987d43216e72ffce42bccf6bf81f62ed.zip |
Merge branches 'mmci' and 'pl011-dma' into devel