diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-15 09:49:21 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-15 09:49:21 -0700 |
commit | 41b55d23eebdf49e2c2911220a1e34282b39473d (patch) | |
tree | cde2ecd13992cf404b0b77200a84ba2076f011a9 /fs/xfs/xfs_qm.h | |
parent | 37b5dca2898d1471729194f45e281c2443eb9d6c (diff) | |
parent | 13e66ceea1600f1061181acc2d4e0fac1a7d0333 (diff) | |
download | op-kernel-dev-41b55d23eebdf49e2c2911220a1e34282b39473d.zip op-kernel-dev-41b55d23eebdf49e2c2911220a1e34282b39473d.tar.gz |
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
- A fix for OMAP5 and DRA7 to make the branch predictor hardening
settings take proper effect on secondary cores
- Disable USB OTG on am3517 since current driver isn't working
- Fix thermal sensor register settings on Armada 38x
- Fix suspend/resume IRQs on pxa3xx
* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: dts: am3517.dtsi: Disable reference to OMAP3 OTG controller
ARM: DRA7/OMAP5: Enable ACTLR[0] (Enable invalidates of BTB) for secondary cores
ARM: pxa: irq: fix handling of ICMR registers in suspend/resume
ARM: dts: armada-38x: use the new thermal binding
Diffstat (limited to 'fs/xfs/xfs_qm.h')
0 files changed, 0 insertions, 0 deletions