summaryrefslogtreecommitdiff
path: root/arch/arm/mach-shmobile/setup-r8a7779.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-01-09 10:03:09 +0900
committerPaul Mundt <lethal@linux-sh.org>2012-01-09 10:03:09 +0900
commite0a23ce20eb98c17c5f7bf4b7f34cb31d0b102f9 (patch)
tree948b70d7004a475ed91c452c38a96f6b05b92dfe /arch/arm/mach-shmobile/setup-r8a7779.c
parent04cf399640b7acfa9abe2eb7900cd934db8af697 (diff)
parente499ada829cf769ac6f16627cd9f09b855a7fd6d (diff)
parent2dacb97d9269e303ed761937a0e9db8711515e08 (diff)
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>