diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-17 12:04:51 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-17 12:04:51 +0100 |
commit | 9c9585e0e96f8340d704256db00b2ec28240c36e (patch) | |
tree | e644bda53c5a1c36a4066c09601566bf20e88ad1 /drivers/rtc/rtc-pl031.c | |
parent | ALSA: AACI: make fifo variables more explanitory (diff) | |
parent | ARM: mmci: add dmaengine-based DMA support (diff) | |
parent | ARM: 6758/1: amba: support pm ops (diff) | |
parent | ARM: 6764/1: pl011: factor out FIFO to TTY code (diff) | |
download | linux-9c9585e0e96f8340d704256db00b2ec28240c36e.tar.xz linux-9c9585e0e96f8340d704256db00b2ec28240c36e.zip |
Merge branches 'aaci', 'mmci-dma', 'pl' and 'pl011' into drivers