diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-29 21:48:58 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-29 21:48:58 (GMT) |
commit | 2a6451718627eb60e85691053cb9820ae7ed3913 (patch) | |
tree | fa7d623561434cd556d5693018035c80e1682b30 /block/cfq-iosched.c | |
parent | 0f1e5b5d19f6c06fe2078f946377db9861f3910d (diff) | |
parent | 5530c84f62b49a2e9f8c11a079d00f85ea20bb09 (diff) | |
download | linux-2a6451718627eb60e85691053cb9820ae7ed3913.tar.xz |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann:
"Two weeks worth of small bug fixes this time, nothing sticking out
this time:
- one defconfig change to adapt to a modified Kconfig symbol
- two fixes for i.MX for backwards compatibility with older DT files
that was accidentally broken
- one regression fix for irq handling on pxa
- three small dt files on omap, and one each for imx and exynos"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: multi_v7_defconfig: Replace CONFIG_USB_ISP1760_HCD by CONFIG_USB_ISP1760
ARM: imx6: gpc: don't register power domain if DT data is missing
ARM: imx6: allow booting with old DT
ARM: dts: set display clock correctly for exynos4412-trats2
ARM: pxa: pxa_cplds: signedness bug in probe
ARM: dts: Fix WLAN interrupt line for AM335x EVM-SK
ARM: dts: omap3-devkit8000: Fix NAND DT node
ARM: dts: am335x-boneblack: disable RTC-only sleep
ARM: dts: fix imx27 dtb build rule
ARM: dts: imx27: only map 4 Kbyte for fec registers
Diffstat (limited to 'block/cfq-iosched.c')
0 files changed, 0 insertions, 0 deletions