Merge branch 'ti-sysc-fixes' into fixes

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

diff --cc arch/arm/boot/dts/am571x-idk.dts
Simple merge

diff --cc arch/arm/boot/dts/am572x-idk.dts
Simple merge

diff --cc arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
Simple merge

diff --cc arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts
Simple merge

diff --cc arch/arm/boot/dts/am57xx-beagle-x15-revc.dts
Simple merge

diff --cc arch/arm/mach-omap1/ams-delta-fiq-handler.S
Simple merge

diff --cc arch/arm/mach-omap1/ams-delta-fiq.c
Simple merge

diff --cc arch/arm/mach-omap2/omap4-common.c
Simple merge