Merge branch 'platform-ti-linux-4.1.y' of...

Merge branch 'platform-ti-linux-4.1.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into ti-linux-4.1.y

TI-Feature: platform_base
TI-Tree: git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree.git
TI-Branch: platform-ti-linux-4.1.y

* 'platform-ti-linux-4.1.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree

:
  ARM: dts: am437x: Update GPMC dma channel to reflect new edma binding
  remoteproc: Fix potential race condition in rproc_add
  ARM: dts: AM57XX-IDK: Correct the thermal thresholds
  ARM: OMAP2+: Add am33xx_pm_deinit stub for !CONFIG_CPU_IDLE

Signed-off-by: Dan Murphy <dmurphy@ti.com>

Conflicts:
	arch/arm/boot/dts/am57xx-idk-common.dtsi