Takashi Iwai 0b2d711759 Merge branch 'for-linus' into for-next ... Yet another non-trivial conflicts for HDA legacy stuff. Signed-off-by: Takashi Iwai <tiwai@suse.de>		2015-06-16 12:48:21 +02:00
..
ac97	ALSA: ac97: Fix ifdef CONFIG_PROC_FS	2015-05-29 07:52:43 +02:00
ali5451	ALSA: remove deprecated use of pci api	2015-04-16 12:19:52 +02:00
asihpi
au88x0	ALSA: remove deprecated use of pci api	2015-04-16 12:19:52 +02:00
aw2	ALSA: remove deprecated use of pci api	2015-04-16 12:19:52 +02:00
ca0106	ALSA: ca0106: Fix/cleanup ifdef CONFIG_PROC_FS	2015-05-29 07:54:45 +02:00
cs46xx	ALSA: cs46xx: Fix old ifdef CONFIG_PROC_FS	2015-05-29 07:55:37 +02:00
cs5535audio	ALSA: remove deprecated use of pci api	2015-04-16 12:19:52 +02:00
ctxfi	ALSA: remove deprecated use of pci api	2015-04-16 12:19:52 +02:00
echoaudio
emu10k1	ALSA: emu10k1: Fix/cleanup ifdef CONFIG_PROC_FS	2015-05-29 07:56:42 +02:00
hda	Merge branch 'for-linus' into for-next	2015-06-16 12:48:21 +02:00
ice1712	ALSA: pci: Drop superfluous ifdef CONFIG_PROC_FS	2015-05-29 08:00:06 +02:00
korg1212
lola
lx6464es	ALSA: lx6464es: Use NULL for pointers	2015-05-26 13:00:00 +02:00
mixart	ALSA: remove deprecated use of pci api	2015-04-16 12:19:52 +02:00
nm256
oxygen	ALSA: pci: Drop superfluous ifdef CONFIG_PROC_FS	2015-05-29 08:00:06 +02:00
pcxhr	ALSA: remove deprecated use of pci api	2015-04-16 12:19:52 +02:00
riptide
rme9652
trident	ALSA: remove deprecated use of pci api	2015-04-16 12:19:52 +02:00
vx222
ymfpci
ad1889.c	ALSA: remove deprecated use of pci api	2015-04-16 12:19:52 +02:00
ad1889.h
ak4531_codec.c	ALSA: pci: Drop superfluous ifdef CONFIG_PROC_FS	2015-05-29 08:00:06 +02:00
als300.c	ALSA: remove deprecated use of pci api	2015-04-16 12:19:52 +02:00
als4000.c	ALSA: remove deprecated use of pci api	2015-04-16 12:19:52 +02:00
atiixp_modem.c	ALSA: pci: Drop superfluous ifdef CONFIG_PROC_FS	2015-05-29 08:00:06 +02:00
atiixp.c	ALSA: pci: Drop superfluous ifdef CONFIG_PROC_FS	2015-05-29 08:00:06 +02:00
azt3328.c	ALSA: remove deprecated use of pci api	2015-04-16 12:19:52 +02:00
azt3328.h
bt87x.c
cmipci.c	ALSA: pci: Drop superfluous ifdef CONFIG_PROC_FS	2015-05-29 08:00:06 +02:00
cs4281.c
cs5530.c
ens1370.c
ens1371.c
es1938.c	ALSA: remove deprecated use of pci api	2015-04-16 12:19:52 +02:00
es1968.c	ALSA: remove deprecated use of pci api	2015-04-16 12:19:52 +02:00
fm801.c
intel8x0.c	ALSA: pci: Drop superfluous ifdef CONFIG_PROC_FS	2015-05-29 08:00:06 +02:00
intel8x0m.c	ALSA: pci: Drop superfluous ifdef CONFIG_PROC_FS	2015-05-29 08:00:06 +02:00
Kconfig
maestro3.c	ALSA: remove deprecated use of pci api	2015-04-16 12:19:52 +02:00
Makefile
rme32.c
rme96.c
sis7019.c	ALSA: remove deprecated use of pci api	2015-04-16 12:19:52 +02:00
sis7019.h
sonicvibes.c	ALSA: remove deprecated use of pci api	2015-04-16 12:19:52 +02:00
via82xx_modem.c
via82xx.c