tree 06cb95cb2f5c29d6767029a0a1b0c8aa49c44963
parent 48546cc0a5c2deac67c9a3cafa3889871b25a4c0
parent cc4ad9072cce2bf0eeae1fb197e42612fbac1f15
author Olof Johansson <olof@lixom.net> 1331232972 -0800
committer Olof Johansson <olof@lixom.net> 1331232972 -0800

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