From: Olof Johansson <olof@lixom.net>
Date: Sun, 26 Oct 2014 03:44:05 +0000 (-0700)
Subject: Merge tag 'imx-fixes-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... 
X-Git-Tag: v4.9.8~5337^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=efc176a8ee1f959b89292597bd8a99417475a79a;p=platform%2Fkernel%2Flinux-rpi3.git

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

Merge "ARM: imx: fixes for 3.18" from Shawn Guo:

The i.MX fixes for 3.18:
 - Revert one patch which increases I2C bus frequency on imx28-evk
 - Fix a typo on imx6q EIM clock name

* tag 'imx-fixes-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx28-evk: Let i2c0 run at 100kHz
  ARM: i.MX6: Fix "emi" clock name typo

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

efc176a8ee1f959b89292597bd8a99417475a79a