Takashi Iwai 241bc82e62 Merge branch 'for-linus' into for-next ... Conflicts: sound/core/control.c		2017-08-22 15:44:45 +02:00
..
emu10k1.c	ALSA: seq: Allow the modular sequencer registration	2017-06-12 08:43:33 +02:00
emu10k1_callback.c	ALSA: emu10k1: constify snd_emux_operators structure	2017-02-19 22:07:29 +01:00
emu10k1_main.c	ALSA: emu10k1: Use workqueue instead of kthread for emu1010 fw polling	2016-11-15 08:21:19 +01:00
emu10k1_patch.c
emu10k1_synth.c
emu10k1_synth_local.h
emu10k1x.c	ALSA: emu10k1: make snd_pcm_hardware const	2017-08-12 23:31:45 +02:00
emufx.c	ALSA: emu10k1: Fix forgotten user-copy conversion in init code	2017-08-18 10:59:02 +02:00
emumixer.c	ALSA: pci: constify snd_kcontrol_new structures	2017-02-21 22:01:21 +01:00
emumpu401.c	ALSA: pci: Constify snd_rawmidi_ops	2017-01-12 12:50:26 +01:00
emupcm.c	ALSA: emu10k1: make snd_pcm_hardware const	2017-08-12 23:31:45 +02:00
emuproc.c
io.c
irq.c
Makefile
memory.c
p16v.c	ALSA: emu10k1: make snd_pcm_hardware const	2017-08-12 23:31:45 +02:00
p16v.h
p17v.h
timer.c
tina2.h
voice.c