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)
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>
1  2 
arch/arm/boot/dts/omap4-panda-es.dts
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/cclock54xx_data.c

Simple merge
index 2530169605d1d26b698cef9f9ed487057c6293ec,c3477e7de6b2e36140852592b7552be723e90643..3ceda910e4b98ac1c369fed8c79c4e0d043b428f
@@@ -87,10 -82,7 +87,9 @@@ config SOC_OMAP
        select CPU_V7
        select HAVE_SMP
        select COMMON_CLK
 +      select USB_ARCH_HAS_EHCI if USB_SUPPORT
 +      select USB_ARCH_HAS_XHCI if USB_SUPPORT
        select ARCH_NEEDS_CPU_IDLE_COUPLED
-       select ARM_ERRATA_798181
  
  comment "OMAP Core Type"
        depends on ARCH_OMAP2
Simple merge