Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel...

Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into ti-linux-3.14.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-3.14.y

* 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  ARM/dmaengine: edma: Move dmaengine pdevice registration to arm/common/edma.c
  clk: ti: clk-7xx: Configure ATL1 and ATL2 clocks
  clk: ti: clk-7xx: Correct ABE DPLL configuration

Conflicts:
	arch/arm/common/edma.c
	drivers/clk/ti/clk-7xx.c

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