Merge tag 'omap-for-v4.3/fixes-rc7' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Sat, 31 Oct 2015 01:41:45 +0000 (01:41 +0000)
committerOlof Johansson <olof@lixom.net>
Sat, 31 Oct 2015 01:42:13 +0000 (01:42 +0000)
commitcd184123508b92aeab85ca271f35d8f6046ca5f0
tree517f31b37c329e3e2f7558614ac5267f1f8641f8
parent6d2355c025aea88499933ecc0ea266c7b8c066ab
parent0d6dbaaf32caa95ee86db82aa694588a6b8166c5
Merge tag 'omap-for-v4.3/fixes-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Two omap regression fixes:

- Fix omap3 MUSB with DMA caused by driver core changes

- Fix LCD DMA interrupt number for omap1 that did not
  get changed for sparse IRQ changes

* tag 'omap-for-v4.3/fixes-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  usb: musb: omap2430: Fix regression caused by driver core change
  ARM: OMAP1: fix incorrect INT_DMA_LCD

Signed-off-by: Olof Johansson <olof@lixom.net>