From: Kevin Hilman <khilman@baylibre.com>
Date: Fri, 22 Apr 2016 23:55:05 +0000 (-0700)
Subject: Merge tag 'imx-fixes-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... 
X-Git-Tag: v4.14-rc1~3387^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6d939bfd43271d7ab0b411d830ab62d835d8536;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'imx-fixes-4.6' of git://git./linux/kernel/git/shawnguo/linux into fixes

Merge "ARM: i.MX fixes for 4.6" from Shawn Guo:

The i.MX fixes for 4.6:
 - The sdhci-esdhc-imx DMA support is broken due to commit 7b91369b4655
   ("mmc: sdhci: Set DMA mask when adding host").  It requires device's
   dma_mask be set up properly to get DMA work.  The fixing patch
   initializes the DMA mask to enable the access again.

* tag 'imx-fixes-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: mach-imx: sdhci-esdhc-imx: initialize DMA mask
---

e6d939bfd43271d7ab0b411d830ab62d835d8536