| commit | efc176a8ee1f959b89292597bd8a99417475a79a | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sat Oct 25 20:44:05 2014 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Sat Oct 25 20:44:05 2014 -0700 |
| tree | 0c510012697520be345f2ec4f0e2a1f32d46c89f | |
| parent | 4fbc400cfc56fb6cb62197ff2244696770251bdf [diff] | |
| parent | d1e61eb443dc7512885dfe89ee2f2a1c29fcb1da [diff] |
Merge tag 'imx-fixes-3.18' of git://git.kernel.org/pub/scm/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>