From: Olof Johansson <olof@lixom.net>
Date: Thu, 8 Mar 2012 18:56:12 +0000 (-0800)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux... 
X-Git-Tag: v3.3-rc7~12^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c66fcfa938d84d4661c77e9fe85312dece0133e8;p=karo-tx-linux.git

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Fix module build errors with CONFIG_OMAP4_ERRATA_I688
  ARM: OMAP: id: Add missing break statement in omap3xxx_check_revision
  ARM: OMAP2+: Remove apply_uV constraints for fixed regulator
  ARM: OMAP: irqs: Fix NR_IRQS value to handle PRCM interrupts
---

c66fcfa938d84d4661c77e9fe85312dece0133e8