Merge branches 'sh/intc-extension', 'sh/dmaengine', 'sh/serial-dma' and 'sh/clkfwk'
authorPaul Mundt <lethal@linux-sh.org>
Tue, 30 Mar 2010 02:26:43 +0000 (11:26 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 30 Mar 2010 02:26:43 +0000 (11:26 +0900)
commit720fcb36ac1aa2df2c54c170253b6b29600cbefc
tree1ce654508a1efe164841fe37c34a471b2e96b1af
parent6ae6650232ddcf2f50e8817acd63cde37cf1d093
parentdec710b77c2cf04bf512acada3c14a16f11708d9
parent3089f381fbaf53560dcbcb4aef6ef17fe44e347c
parentf4cff0d0ffc0162636357d0475409ecf1304f854
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>
drivers/base/platform.c
drivers/serial/sh-sci.c
drivers/sh/intc.c