diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-03-30 04:26:43 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-03-30 04:26:43 +0200 |
| commit | 720fcb36ac1aa2df2c54c170253b6b29600cbefc (patch) | |
| tree | 1ce654508a1efe164841fe37c34a471b2e96b1af /drivers/base/platform.c | |
| parent | sh: tlb debugfs support. (diff) | |
| parent | sh: INTC ioremap support (diff) | |
| parent | SH: extend SCI DMA support to work on SCIFA ports (diff) | |
| parent | sh: sh7724 clkdev lookups. (diff) | |
| download | linux-720fcb36ac1aa2df2c54c170253b6b29600cbefc.tar.xz linux-720fcb36ac1aa2df2c54c170253b6b29600cbefc.zip | |
Merge branches 'sh/intc-extension', 'sh/dmaengine', 'sh/serial-dma' and 'sh/clkfwk'
Conflicts:
arch/sh/kernel/cpu/clock.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>