Takashi Iwai 49c4a4c524 Merge branch 'for-linus' into for-next ... Conflicts: sound/pci/emu10k1/emu10k1_main.c Signed-off-by: Takashi Iwai <tiwai@suse.de>		2015-04-29 07:28:29 +02:00
..
emu10k1_callback.c	ALSA: emu10k1: Emu10k2 32 bit DMA mode	2015-04-29 07:27:30 +02:00
emu10k1_main.c	Merge branch 'for-linus' into for-next	2015-04-29 07:28:29 +02:00
emu10k1_patch.c	ALSA: emu10k1: Use standard printk helpers	2014-02-26 16:45:27 +01:00
emu10k1_synth_local.h
emu10k1_synth.c	ALSA: seq: Define driver object in each driver	2015-02-12 14:15:54 +01:00
emu10k1.c	ALSA: emu10k1: Fix card shortname string buffer overflow	2015-04-27 13:00:09 +02:00
emu10k1x.c	ALSA: emu10k1: Remove always NULL parameters	2015-01-02 16:32:45 +01:00
emufx.c	ALSA: emu10k1: Remove always NULL parameters	2015-01-02 16:32:45 +01:00
emumixer.c	ALSA: emu10k1: add toggles for E-mu 1010 optical ports	2015-04-11 18:35:06 +02:00
emumpu401.c	ALSA: emu10k1: Use standard printk helpers	2014-02-26 16:45:27 +01:00
emupcm.c	ALSA: emu10k1: Emu10k2 32 bit DMA mode	2015-04-29 07:27:30 +02:00
emuproc.c	ALSA: emu10k1: don't deadlock in proc-functions	2015-04-10 13:02:23 +02:00
io.c	ALSA: emu10k1: Fix possible NULL dereference	2014-03-05 12:15:56 +01:00
irq.c	ALSA: emu10k1: Use standard printk helpers	2014-02-26 16:45:27 +01:00
Makefile
memory.c	ALSA: emu10k1: Emu10k2 32 bit DMA mode	2015-04-29 07:27:30 +02:00
p16v.c	ALSA: emu10k1: Delete an unnecessary check before the function call "kfree"	2015-01-04 15:12:08 +01:00
p16v.h
p17v.h
timer.c
tina2.h
voice.c	ALSA: emu10k1: Use standard printk helpers	2014-02-26 16:45:27 +01:00