iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/sound/pci
History
Takashi Iwai cc1b76ed32 Merge branch 'for-linus' into for-next 
Yet another non-trivial conflicts resolution for the recent HD-audio fix.

Conflicts:
	sound/pci/hda/hda_intel.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
2015-06-12 08:10:20 +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
ALSA: asihpi: Fix duplicate const for clock sources
2015-03-24 11:51:43 +01:00
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
ALSA: echoaudio: read past end of array
2015-03-23 14:00:28 +01:00
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-12 08:10:20 +02:00
ice1712
ALSA: pci: Drop superfluous ifdef CONFIG_PROC_FS
2015-05-29 08:00:06 +02:00
korg1212
ALSA: Include linux/io.h instead of asm/io.h
2015-01-28 16:49:33 +01:00
lola
ALSA: Deletion of checks before the function call "iounmap"
2015-01-04 15:13:45 +01:00
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
ALSA: Include linux/io.h instead of asm/io.h
2015-01-28 16:49:33 +01:00
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
ALSA: off by one bug in snd_riptide_joystick_probe()
2015-02-09 14:57:15 +01:00
rme9652
ALSA: hdspm - DRY cleanup of snd_pcm_ops
2015-02-17 07:40:36 +01:00
trident
ALSA: remove deprecated use of pci api
2015-04-16 12:19:52 +02:00
vx222
ALSA: Include linux/io.h instead of asm/io.h
2015-01-28 16:49:33 +01:00
ymfpci
ALSA: Include linux/io.h instead of asm/io.h
2015-01-28 16:49:33 +01:00
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
ALSA: azt3328: fix previous breakage, improve suspend, cleanups
2009-07-15 12:03:26 +02:00
bt87x.c
ALSA: Include linux/io.h instead of asm/io.h
2015-01-28 16:49:33 +01:00
cmipci.c
ALSA: pci: Drop superfluous ifdef CONFIG_PROC_FS
2015-05-29 08:00:06 +02:00
cs4281.c
ALSA: Include linux/io.h instead of asm/io.h
2015-01-28 16:49:33 +01:00
cs5530.c
ASoC: sb16: Simplify snd_sb16dsp_pcm()
2015-01-02 16:28:35 +01:00
ens1370.c
ALSA: Include linux/io.h instead of asm/io.h
2015-01-28 16:49:33 +01:00
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
ALSA: fm801: remove FSF address
2015-01-11 11:27:13 +01:00
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
ALSA: add Studio Evolution SE6X support
2015-01-16 22:44:56 +01:00
maestro3.c
ALSA: remove deprecated use of pci api
2015-04-16 12:19:52 +02:00
Makefile
ALSA: Add the driver for Digigram Lola PCI-e boards
2011-05-03 16:31:05 +02:00
rme32.c
ALSA: Include linux/io.h instead of asm/io.h
2015-01-28 16:49:33 +01:00
rme96.c
ALSA: Include linux/io.h instead of asm/io.h
2015-01-28 16:49:33 +01:00
sis7019.c
ALSA: remove deprecated use of pci api
2015-04-16 12:19:52 +02:00
sis7019.h
trivial: fix typos s/paramter/parameter/ and s/excute/execute/ in documentation and source comments.
2009-06-12 18:01:46 +02:00
sonicvibes.c
ALSA: remove deprecated use of pci api
2015-04-16 12:19:52 +02:00
via82xx_modem.c
ALSA: Include linux/io.h instead of asm/io.h
2015-01-28 16:49:33 +01:00
via82xx.c
ALSA: Use const struct ac97_quirk
2015-04-05 08:41:05 +02:00