Merge branch 'fixes' of git://gitorious.org/linux-davinci/linux-davinci into next...
authorArnd Bergmann <arnd@arndb.de>
Thu, 15 Mar 2012 15:50:27 +0000 (15:50 +0000)
committerArnd Bergmann <arnd@arndb.de>
Thu, 15 Mar 2012 15:51:06 +0000 (15:51 +0000)
commitf82989bde1cfa5e2b4614d8e4896d795dae418d9
tree970cd7c833fad85acbf00be335b0ae8c4991b375
parent695d82fae9160406acb9de204c471248abcc2a9f
parent30c766bdeccf945615097ca185326c1d7199f023
Merge branch 'fixes' of git://gitorious.org/linux-davinci/linux-davinci into next/fixes-non-critical

* '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>
arch/arm/Kconfig
arch/arm/mach-omap2/id.c
arch/arm/mach-ux500/Kconfig