diff options
| author | Kevin Hilman <khilman@baylibre.com> | 2016-04-22 16:52:55 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2016-04-22 16:53:49 -0700 |
| commit | 22c49e5a09ec6af0c2355503b880a4083facdcf2 (patch) | |
| tree | 6031897530e0afe01fdb37dfe1cea0c3d21568dc /arch/s390 | |
| parent | c95e2e7eddfa571dccc8cfe645c790ff7fb7e2e0 (diff) | |
| parent | 1560d15861769c23fd981e2d60dc7fd790b21e1e (diff) | |
Merge tag 'omap-for-v4.6/fixes-rc3' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/s390')
0 files changed, 0 insertions, 0 deletions