diff options
| author | Olof Johansson <olof@lixom.net> | 2014-10-25 20:44:05 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-10-25 20:44:05 -0700 |
| commit | efc176a8ee1f959b89292597bd8a99417475a79a (patch) | |
| tree | 0c510012697520be345f2ec4f0e2a1f32d46c89f /include/acpi/actbl3.h | |
| parent | 4fbc400cfc56fb6cb62197ff2244696770251bdf (diff) | |
| parent | d1e61eb443dc7512885dfe89ee2f2a1c29fcb1da (diff) | |
| download | blackbird-op-linux-efc176a8ee1f959b89292597bd8a99417475a79a.tar.gz blackbird-op-linux-efc176a8ee1f959b89292597bd8a99417475a79a.zip | |
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>
Diffstat (limited to 'include/acpi/actbl3.h')
0 files changed, 0 insertions, 0 deletions
