Merge branches 'common/pfc' and 'common/clkfwk' into rmobile/marzen
authorPaul Mundt <lethal@linux-sh.org>
Mon, 9 Jan 2012 01:03:09 +0000 (10:03 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 9 Jan 2012 01:03:09 +0000 (10:03 +0900)
commite0a23ce20eb98c17c5f7bf4b7f34cb31d0b102f9
tree948b70d7004a475ed91c452c38a96f6b05b92dfe
parent04cf399640b7acfa9abe2eb7900cd934db8af697
parente499ada829cf769ac6f16627cd9f09b855a7fd6d
parent2dacb97d9269e303ed761937a0e9db8711515e08
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>
arch/arm/mach-shmobile/clock-sh73a0.c
arch/arm/mach-shmobile/include/mach/common.h