Merge branch 'sh/hwblk' into sh-latest

diff --cc arch/sh/include/cpu-sh4/cpu/sh7724.h
Simple merge

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

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