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)
* '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>

Trivial merge