Merge branch 'fixes' of git://gitorious.org/linux-davinci/linux-davinci into next...

* 'fixes' of git://gitorious.org/linux-davinci/linux-davinci: (2 commits)
  ARM: davinci: DA850: move da850_register_pm to .init.text
  ARM: davinci: cpufreq: fix compiler warning

(update to v3.3-rc7)

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/id.c
Simple merge

diff --cc arch/arm/mach-ux500/Kconfig
index d205de4,c59e8b8..9ec6358
--- 1/arch/arm/mach-ux500/Kconfig
--- 2/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@@ -5,13 -5,14 +5,13 @@@ config UX500_SOC_COMMO
        default y
        select ARM_GIC
        select HAS_MTU
-       select ARM_ERRATA_753970
+       select PL310_ERRATA_753970
        select ARM_ERRATA_754322
        select ARM_ERRATA_764369
 -
 -menu "Ux500 SoC"
 +      select CACHE_L2X0
  
  config UX500_SOC_DB5500
 -      bool "DB5500"
 +      bool
        select MFD_DB5500_PRCMU
  
  config UX500_SOC_DB8500