diff options
| author | Olof Johansson <olof@lixom.net> | 2012-12-17 21:40:51 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-12-17 21:40:51 -0500 |
| commit | 1dc1d2e9485074d5f495beb7771a3ab20eb504e9 (patch) | |
| tree | 96f5e6829816c21b6b6ad243ad26bde86abb12ed /drivers/dio/dio-sysfs.c | |
| parent | a93178a13dbd35850ec8a86b023e1f8953e80dae (diff) | |
| parent | 027c0a6af42efa4f2f6034421349bd26a3ca4923 (diff) | |
Merge tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
From Sascha Hauer:
ARM i.MX fixes for v3.8-rc
This fixes a compile failure on imx_v4_v5_defconfig and a regression
introduced with enabling the MIPI clocks on i.MX51. Also one rather
cosmetic fix for the i.MX27 dts file.
* tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM: imx: Move platform-mx2-emma to arch/arm/mach-imx/devices
ARM i.MX51 clock: Fix regression since enabling MIPI/HSP clocks
ARM: dts: mx27: Fix the AIPI bus for FEC
Diffstat (limited to 'drivers/dio/dio-sysfs.c')
0 files changed, 0 insertions, 0 deletions