Merge branches 'heads/fixes-for-v3.13', 'heads/cleanup' and 'heads/dt' into devel

diff --cc arch/arm/mach-shmobile/board-bockw-reference.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-lager.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-marzen.c
Simple merge

diff --cc arch/arm/mach-shmobile/clock-r7s72100.c
Simple merge

diff --cc arch/arm/mach-shmobile/clock-r8a7790.c
Simple merge

diff --cc arch/arm/mach-shmobile/clock-sh73a0.c
Simple merge