diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2015-11-25 23:45:53 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-11-25 23:45:53 +0100 |
| commit | fabc2c9c1ff5376489e83e142f1ab236609435b1 (patch) | |
| tree | 9614ee1c291d7122e269dc7d6518f6a2a92970c8 /include/net/sock.h | |
| parent | soc: Mediatek: Enable SCPSYS power domain driver by default (diff) | |
| parent | ARM: dts: vfxxx: Fix dspi[01] spi-num-chipselects. (diff) | |
| download | linux-dev-fabc2c9c1ff5376489e83e142f1ab236609435b1.tar.xz linux-dev-fabc2c9c1ff5376489e83e142f1ab236609435b1.zip | |
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/net/sock.h')
0 files changed, 0 insertions, 0 deletions