From: Kevin Hilman <khilman@baylibre.com>
Date: Fri, 22 Apr 2016 23:52:55 +0000 (-0700)
Subject: Merge tag 'omap-for-v4.6/fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.6-rc6~24^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=22c49e5a09ec6af0c2355503b880a4083facdcf2;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'omap-for-v4.6/fixes-rc3' of git://git./linux/kernel/git/tmlind/linux-omap into fixes

Merge "omap fixes for v4.6-rc cycle" from Tony Lindgren:

Fixes for omaps for v4.6-rc cycle:

- Clockdomain fix for dra7 timer interrupts

- Two fixes for GPMC EDMA binding, I missed the need for a merge with
  GPMC changes and EDMA changes

- Fix beagle-x15 eSATA by dropping misconfigured extcon_usb1

- Fix occasional external aborts on 36xx with PM that we've been
  chasing for past few months. It turned out to be duplicate restore
  of INTC registers that can in some cases cause us to hit erratum 1.106.

* tag 'omap-for-v4.6/fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP3: Fix external abort on 36xx waking from off mode idle
  ARM: dts: am57xx-beagle-x15: remove extcon_usb1
  ARM: dts: am437x: Fix GPMC dma properties
  ARM: dts: am33xx: Fix GPMC dma properties
  ARM: DRA7: clockdomain: Implement timer workaround for errata i874
---

22c49e5a09ec6af0c2355503b880a4083facdcf2