summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-11-25 23:45:53 +0100
committerArnd Bergmann <arnd@arndb.de>2015-11-25 23:45:53 +0100
commitfabc2c9c1ff5376489e83e142f1ab236609435b1 (patch)
tree9614ee1c291d7122e269dc7d6518f6a2a92970c8 /include/linux
parent627b655336fb20c7fdbefa7125b4c4aeead9b5fb (diff)
parent897ed0ca5979f103b8de3c09bcca2ae4860eb5a5 (diff)
Merge tag 'imx-fixes-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
Merge "The i.MX fixes for 4.4" from Shawn Guo: - Add missing .irq_set_type for i.MX GPC irq_chip. It fixes an issue that device IRQ type setting doesn't match the one specified in device tree, since stacked IRQ domain is adopted in GPC driver. - Fix the wrong spi-num-chipselects settings for Vybrid DSPI devices. - Fix a merge error in Vybrid dts regarding to ADC device property fsl,adck-max-frequency * tag 'imx-fixes-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: vfxxx: Fix dspi[01] spi-num-chipselects. ARM: imx: add platform irq type setting in gpc ARM: dts: vfxxx: Fix erroneous property in esdhc0 node
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions