Merge branches 'heads/cleanup-for-v3.16', 'heads/defconfig-for-v3.16', 'heads/soc...

diff --cc arch/arm/boot/dts/r8a7790-lager.dts
Simple merge

diff --cc arch/arm/boot/dts/r8a7790.dtsi
Simple merge

diff --cc arch/arm/boot/dts/r8a7791.dtsi
Simple merge

diff --cc arch/arm/mach-shmobile/Kconfig
Simple merge

diff --cc arch/arm/mach-shmobile/Makefile
Simple merge

diff --cc include/dt-bindings/clock/r8a7790-clock.h
Simple merge

diff --cc include/dt-bindings/clock/r8a7791-clock.h
Simple merge