From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 30 Mar 2010 02:26:43 +0000 (+0900)
Subject: Merge branches 'sh/intc-extension', 'sh/dmaengine', 'sh/serial-dma' and 'sh/clkfwk'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=720fcb36ac1aa2df2c54c170253b6b29600cbefc;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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>
---

720fcb36ac1aa2df2c54c170253b6b29600cbefc