Merge branch 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel...
authorDan Murphy <dmurphy@ti.com>
Tue, 23 Apr 2013 15:11:43 +0000 (10:11 -0500)
committerDan Murphy <dmurphy@ti.com>
Tue, 23 Apr 2013 15:11:43 +0000 (10:11 -0500)
commit21ea3d6ad56e51613cad60372aec9fe4dac48890
treeaf336e3f2f552fd99490e60a50977064950a70e4
parent5440c438f2b92a829105fbfedd1404125b11b623
parent96e1ede1176edef7a7f6b80278c82d31642e4169
Merge branch 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into ti-linux-3.8.y

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

* 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  Revert "ARM: OMAP5: Enable workaround for 798181"
  ARM: dts: omap4-panda: move generic sections to panda-common
  ARM: OMAP5: Source DPLL_ABE from sys_clk
  ARM: OMAP5: Init DPLL_ABE CLKOUTX2_M2 to 196MHz

Conflicts:
arch/arm/boot/dts/omap4-panda.dts

Signed-off-by: Dan Murphy <dmurphy@ti.com>
arch/arm/boot/dts/omap4-panda-es.dts
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/cclock54xx_data.c