Merge branches 'sh/hwblk' and 'sh/pm-runtime'
authorPaul Mundt <lethal@linux-sh.org>
Sun, 23 Aug 2009 09:04:07 +0000 (18:04 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Sun, 23 Aug 2009 09:04:07 +0000 (18:04 +0900)
commitc3144fc46f987413df10e83659f0bf1aad76f79e
treea09f3c13c32664a617d3981ae111436c3127ccc3
parent4f896ffca2b72f4b719746e7fbb0b623252e6ac9
parentcc58f597afc63a57bb55ed97c2a72f7405320c93
Merge branches 'sh/hwblk' and 'sh/pm-runtime'
arch/sh/Kconfig
arch/sh/boards/mach-kfr2r09/setup.c
arch/sh/boards/mach-se/7724/setup.c
arch/sh/kernel/cpu/sh4a/clock-sh7724.c