Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel...
authorDan Murphy <DMurphy@ti.com>
Tue, 11 Nov 2014 05:32:22 +0000 (23:32 -0600)
committerDan Murphy <DMurphy@ti.com>
Tue, 11 Nov 2014 05:32:22 +0000 (23:32 -0600)
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:
  ti_config_fragments/baseport.cfg: Disable extra debug options
  ARM: dts: dra7: fix DSS PLL clock mux registers

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

Simple merge