summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-01-05 19:08:31 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-01-05 19:08:31 +0100
commitaa312be1987d43216e72ffce42bccf6bf81f62ed (patch)
treeb994c25fc1492d7ff70d2ca83c64106b4883a808 /drivers/serial
parentMerge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'ver... (diff)
parentARM: mmci: Clean up MMCI announcement printk (diff)
parentARM: PL011: add DMA burst threshold support for ST variants (diff)
downloadlinux-aa312be1987d43216e72ffce42bccf6bf81f62ed.tar.xz
linux-aa312be1987d43216e72ffce42bccf6bf81f62ed.zip
Merge branches 'mmci' and 'pl011-dma' into devel