Merge branch 'master' into sh/clkfwk

diff --cc arch/sh/kernel/cpu/clock.c
Simple merge

diff --cc arch/sh/kernel/cpu/sh4a/setup-sh7343.c
Simple merge

diff --cc arch/sh/kernel/cpu/sh4a/setup-sh7366.c
Simple merge

diff --cc arch/sh/kernel/cpu/sh4a/setup-sh7724.c
Simple merge