Merge branch 'master' into sh/clkfwk
authorPaul Mundt <lethal@linux-sh.org>
Tue, 12 May 2009 10:54:36 +0000 (19:54 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 12 May 2009 10:54:36 +0000 (19:54 +0900)
commitfd5b12458b25a88eb6f6b56464846d98a45e8928
tree916107480879f131b504652af4f74524b2f327b3
parent9fe5ee0efb1b1d4a0939bc4252a8427e3337d96a
parent8be5f1a68f2c14082939dd54e7037dcee2eb54f8
Merge branch 'master' into sh/clkfwk
arch/sh/kernel/cpu/clock.c
arch/sh/kernel/cpu/sh4a/setup-sh7343.c
arch/sh/kernel/cpu/sh4a/setup-sh7366.c
arch/sh/kernel/cpu/sh4a/setup-sh7724.c