Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel...
authorDan Murphy <DMurphy@ti.com>
Fri, 12 Sep 2014 14:09:03 +0000 (09:09 -0500)
committerDan Murphy <DMurphy@ti.com>
Fri, 12 Sep 2014 14:09:03 +0000 (09:09 -0500)
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:
  drivers/rtc/Kconfig: add SOC_AM43XX/DRA7XX for the supported platforms for OMAP RTC
  clk: ti: dra7-atl-clock: fix a memory leak
  ARM: dts: am33xx: Update rtc node compatible

Signed-off-by: Dan Murphy <DMurphy@ti.com>
1  2 
arch/arm/boot/dts/am33xx.dtsi

Simple merge