| author | Felipe Balbi <balbi@ti.com> | |
| Wed, 24 Apr 2013 11:36:31 +0000 (14:36 +0300) | ||
| committer | Felipe Balbi <balbi@ti.com> | |
| Wed, 24 Apr 2013 11:36:31 +0000 (14:36 +0300) | ||
| commit | 6a1335f128eb19bda0684df142337acc98de2222 | |
| tree | b7b67115970b4bdf5d785ce7abfaa17f0fcfa6e3 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 789f38e308988141e799332d23db75c36b0095fe | commit | diff |
| parent | 96e1ede1176edef7a7f6b80278c82d31642e4169 | commit | diff |
Merge branch 'platform-base-3.8.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into tmp
* 'platform-base-3.8.y' of git://git.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
ARM: OMAP5: Enable workaround for 798181
arm: errata: Workaround for Cortex-A15 erratum 798181 (TLBI/DSB operations)
Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
arch/arm/boot/dts/omap4-panda.dts
* 'platform-base-3.8.y' of git://git.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
ARM: OMAP5: Enable workaround for 798181
arm: errata: Workaround for Cortex-A15 erratum 798181 (TLBI/DSB operations)
Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
arch/arm/boot/dts/omap4-panda.dts