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
emu10k1_callback.c
emu10k1_main.c
emu10k1_patch.c
emu10k1_synth.c
emu10k1_synth_local.h
emu10k1x.c
emufx.c
emumixer.c
emumpu401.c
emupcm.c
emuproc.c
io.c
irq.c
Makefile
memory.c
p16v.c
p16v.h
p17v.h
timer.c
tina2.h
voice.c