tree 8965b4bfd88e8c052c94295e30cce8b409819c96
parent 2123b16bb6275b8b3de27a1ae0962ed31b44bcf1
parent f4ebf1d1f8d10b703493e76300605e8be2f21bf5
author Arnd Bergmann <arnd@arndb.de> 1325022991 +0000
committer Arnd Bergmann <arnd@arndb.de> 1325022991 +0000

Merge branch 'omap/hwmod' into next/devel

* omap/hwmod:
  ARM: OMAP3+: hwmod data: Add the default clockactivity for I2C
  ARM: OMAP3: hwmod data: disable multiblock reads on MMC1/2 on OMAP34xx/35xx <= ES2.1
  ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP4
  ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP3
  ARM: OMAP: hwmod data: Add support for AM35xx UART4/ttyO3
  ARM: OMAP: hwmod data: fix the panic on Nokia RM-680 during boot
  ARM: OMAP: hwmod data: fix iva and mailbox hwmods for OMAP 3
  ARM: OMAP: rx51: fix USB
  ARM: OMAP: mcbsp: Fix possible memory corruption