Merge branches 'sh/earlytimer' and 'sh/shmobile-r2r-staging'

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

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

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