Merge tag 'omap-for-v3.10/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 14:40:45 +0000 (16:40 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 14:40:45 +0000 (16:40 +0200)
commitb8250dc4192c6adab0b9a713a11bf19afc462c96
tree830299d0edad314367e075012ef9ca841a3026d1
parent56734ee2835caaf62168c28281403b61b5826841
parent7a9819950f47dbf319895ee78220f2761f3687a3
Merge tag 'omap-for-v3.10/soc-signed' of git://git./linux/kernel/git/tmlind/linux-omap into next/soc

From Tony Lindgren <tony@atomide.com>:

Changes needed for enabling SOC_BUS for the SoC revision
information. Also enable few HW errata workarounds for omap4.

* tag 'omap-for-v3.10/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (236 commits)
  ARM: OMAP4: Enable fix for Cortex-A9 erratas
  ARM: OMAP2+: Export SoC information to userspace
  ARM: OMAP2+: SoC name and revision unification
  ARM: OMAP2+: Move common part of late init into common function

Includes an update to Linux 3.9-rc6

Conflicts:
arch/arm/mach-omap2/cclock44xx_data.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/Kconfig
arch/arm/mach-omap2/cclock44xx_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
drivers/clk/tegra/clk-tegra20.c