tree 948b70d7004a475ed91c452c38a96f6b05b92dfe
parent 04cf399640b7acfa9abe2eb7900cd934db8af697
parent e499ada829cf769ac6f16627cd9f09b855a7fd6d
parent 2dacb97d9269e303ed761937a0e9db8711515e08
author Paul Mundt <lethal@linux-sh.org> 1326070989 +0900
committer Paul Mundt <lethal@linux-sh.org> 1326070989 +0900

Merge branches 'common/pfc' and 'common/clkfwk' into rmobile/marzen

Conflicts:
	arch/arm/mach-shmobile/clock-sh73a0.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>