diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-08 14:12:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-08 14:12:46 -0700 |
| commit | ca04b3cca11acbaf904f707f2d9ca9654d7cc226 (patch) | |
| tree | a5e604a072ec2f3627cfed145a6aa2a81726614a /include/asm-frv/timer-regs.h | |
| parent | 23adbe6fb571897b57c1f3dd952d598edce2f8e6 (diff) | |
| parent | f0463f3619fd10e0cbaa5195bf2bc264a77a586d (diff) | |
| download | linux-ca04b3cca11acbaf904f707f2d9ca9654d7cc226.tar.bz2 | |
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 small collection of fixes, sort of the usual at this point, all for
i.MX or OMAP:
- Enable ULPI drivers on i.MX to avoid a hang
- Pinctrl fix for touchscreen on i.MX51 ZII RDU1
- Fixes for ethernet clock references on am3517
- mmc0 write protect detection fix for am335x
- kzalloc->kcalloc conversion in an OMAP driver
- USB metastability fix for USB on dra7
- Fix touchscreen wakeup on am437x"
* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: imx_v4_v5_defconfig: Select ULPI support
ARM: imx_v6_v7_defconfig: Select ULPI support
ARM: dts: omap3: Fix am3517 mdio and emac clock references
ARM: dts: am335x-bone-common: Fix mmc0 Write Protect
bus: ti-sysc: Use 2-factor allocator arguments
ARM: dts: dra7: Disable metastability workaround for USB2
ARM: dts: imx51-zii-rdu1: fix touchscreen pinctrl
ARM: dts: am437x: make edt-ft5x06 a wakeup source
Diffstat (limited to 'include/asm-frv/timer-regs.h')
0 files changed, 0 insertions, 0 deletions