summaryrefslogtreecommitdiff
path: root/include/linux/sysrq.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-06-14 16:25:43 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2018-06-14 16:25:43 +0900
commit4b4bb99b6246007eccbc0731eae0b6742c24efa5 (patch)
treec81d34499eb1e89101741395ef345be43d6a7c71 /include/linux/sysrq.h
parent9bca19a01d50143b736f0f59eb3ccc05b1106172 (diff)
parent414c52b7899aa9097c2fa8444654a866e1df4a0c (diff)
Merge tag 'pwm/for-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
Pull pwm updates from Thierry Reding: "This contains a couple of fixes and cleanups for the Meson and ACPI/LPSS drivers as well as capture support for STM32. Note that given the cross- subsystem changes, the STM32 patches were merged through the MFD and PWM trees, both sharing an immutable branch" * tag 'pwm/for-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: pwm: stm32: Fix build warning with CONFIG_DMA_ENGINE disabled pwm: stm32: Enforce dependency on CONFIG_MFD_STM32_TIMERS ACPI / LPSS: Add missing prv_offset setting for byt/cht PWM devices pwm: lpss: platform: Save/restore the ctrl register over a suspend/resume dt-bindings: mfd: stm32-timers: Add support for dmas pwm: simplify getting .drvdata pwm: meson: Fix allocation of PWM channel array
Diffstat (limited to 'include/linux/sysrq.h')
0 files changed, 0 insertions, 0 deletions