diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-07 18:21:57 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-07 18:21:57 +0200 |
| commit | c92b83a81ad09267619ccd077ddd2a5e321d8a61 (patch) | |
| tree | e1741463575cb53d3e74a9d49c3f7e83c8a563a0 /fs/dlm | |
| parent | d6bcc8069b27090f7e5bbe0521774f11c68a7001 (diff) | |
| parent | 68ce9a1f24b8e8894955032a4af74998315be9fe (diff) | |
| download | linux-c92b83a81ad09267619ccd077ddd2a5e321d8a61.tar.bz2 | |
Merge tag 'imx-fixes-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
Pull "The i.MX fixes for 4.1" from Shawn Guo:
- A couple of imx23-olinuxino device tree fixes regarding to LED GPIO
polarity and USB dr_mode setting
- One i.MX28 device tree fix on AUART4 TX-DMA interrupt name
- Add missing pwm-cells to PWM4 for i.MX25 device tree
- Fix imx6q-phytec device tree to get correct USB VBUS control
- Drop invalid pinctrl-assert-gpios property from imx6qdl-sabreauto
device tree, which was sneaked in from vendor device tree
- One fix on Wolfram's broken email address
* tag 'imx-fixes-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: imx6qdl-sabreauto: remove pinctrl-assert-gpios
ARM: dts: imx28: Fix AUART4 TX-DMA interrupt name
ARM: dts: imx25: Add #pwm-cells to pwm4
ARM: dts: imx6: phyFLEX: USB VBUS control is active-high
ARM: mach-imx: devices: platform-sdhci-esdhc-imx: fix broken email address
ARM: dts: imx23-olinuxino: Fix dr_mode of usb0
ARM: dts: imx23-olinuxino: Fix polarity of LED GPIO
Diffstat (limited to 'fs/dlm')
0 files changed, 0 insertions, 0 deletions