summaryrefslogtreecommitdiffstats
path: root/drivers/iio/proximity
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-10-28 12:43:29 +0100
committerTakashi Iwai <tiwai@suse.de>2019-10-28 12:43:34 +0100
commite2e556a9549eebde9797a04729efdfc54f37e5cc (patch)
treebe8e60c5c7021ebb3bda12ebe8a921fbb8883c4e /drivers/iio/proximity
parentALSA: intel_hdmi: Remove dev_err() on platform_get_irq() failure (diff)
parentRevert "ALSA: hda: Flush interrupts on disabling" (diff)
downloadlinux-e2e556a9549eebde9797a04729efdfc54f37e5cc.tar.xz
linux-e2e556a9549eebde9797a04729efdfc54f37e5cc.zip
Merge branch 'for-linus' into for-next
Back-merge the development process for catching up the HD-audio fix (and apply a new one on top of that). Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/iio/proximity')
0 files changed, 0 insertions, 0 deletions