diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-03-30 11:26:43 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-03-30 11:26:43 +0900 |
| commit | 720fcb36ac1aa2df2c54c170253b6b29600cbefc (patch) | |
| tree | 1ce654508a1efe164841fe37c34a471b2e96b1af /include/linux | |
| parent | 6ae6650232ddcf2f50e8817acd63cde37cf1d093 (diff) | |
| parent | dec710b77c2cf04bf512acada3c14a16f11708d9 (diff) | |
| parent | 3089f381fbaf53560dcbcb4aef6ef17fe44e347c (diff) | |
| parent | f4cff0d0ffc0162636357d0475409ecf1304f854 (diff) | |
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>