linux/sound
Greg Kroah-Hartman 2c136de302 Merge 86cfccb669 ("Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm") into android-mainline
Steps along the way to 5.9-rc1

Fixed conflicts in:
	drivers/scsi/ufs/Kconfig
	drivers/scsi/ufs/ufshcd-crypto.c
	drivers/scsi/ufs/ufshcd.h
	drivers/staging/android/ion/ion.c
	drivers/staging/android/ion/ion_heap.c
	include/linux/ion.h

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia2602190d5960b7ad1beaf49a00489d49f144a4e
2020-08-07 16:19:28 +02:00
..
ac97
aoa treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
arm
atmel ALSA: atmel: Remove invalid "fall through" comments 2020-07-09 19:10:11 +02:00
core sound updates for 5.9 2020-08-06 14:27:31 -07:00
drivers sound updates for 5.9 2020-08-06 14:27:31 -07:00
firewire ALSA: firewire: fix kernel-doc 2020-07-07 12:09:32 +02:00
hda ALSA: hda: Add dma stop delay variable 2020-08-05 12:27:47 +02:00
i2c
isa sound updates for 5.9 2020-08-06 14:27:31 -07:00
mips
oss ALSA: Use fallthrough pseudo-keyword 2020-07-09 13:01:29 +02:00
parisc
pci ALSA: pci: delete repeated words in comments 2020-08-06 09:30:02 +02:00
pcmcia ALSA: Use fallthrough pseudo-keyword 2020-07-09 13:01:29 +02:00
ppc ALSA: Replace the word "slave" in vmaster API 2020-07-20 10:10:47 +02:00
sh
soc Merge 86cfccb669 ("Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm") into android-mainline 2020-08-07 16:19:28 +02:00
sparc ALSA: Replace HTTP links with HTTPS ones 2020-07-19 20:49:25 +02:00
spi
synth
usb Merge 86cfccb669 ("Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm") into android-mainline 2020-08-07 16:19:28 +02:00
x86 treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
xen ALSA: xen: Remove superfluous fall through comments 2020-07-09 19:10:37 +02:00
ac97_bus.c
Kconfig
last.c
Makefile
sound_core.c