commit f18651eb2c7ac13b9dd0e3b357d07e1d4cd8e00d
author Arnd Bergmann <arnd@arndb.de> Mon Mar 17 15:31:30 2014 +0100
committer Arnd Bergmann <arnd@arndb.de> Mon Mar 17 15:31:30 2014 +0100
tree f451e22f54d6f7a3d85bbed929750ee2a84d7dbb
parent b8ba3874b4cf43ef1970cb3fe664a28d621ea197
parent 77319669af37a1cfc844b801e83343b37e3c7e13

Merge tag 'omap-for-v3.15/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

Merge "omap fixes for v3.15 merge window" from Tony Lindgren:

Fixes for omaps that would be good to get in before v3.15-rc1.

* tag 'omap-for-v3.15/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP4: hwmod data: correct the idlemodes for spinlock
  ARM: dts: am33xx: correcting dt node unit address for usb
  ARM: dts: omap4/5: Use l3_ick for the gpmc node
  CLK: TI: OMAP4/5/DRA7: Remove gpmc_fck from dummy clocks
  ARM: OMAP4: Fix definition of IS_PM44XX_ERRATUM
  ARM: OMAP2+: INTC: Acknowledge stuck active interrupts

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