renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 07:04:00 +08:00
Code
9bc889b4ba
linux-next/sound/pci
History
Takashi Iwai 19566b0bd9 Merge branch 'for-linus' into for-next 
This merges the USB-audio disconnect fix and resolves the conflicts
so that we can continue working on development of usb-audio stuff.

Conflicts:
	sound/usb/card.c
2014-11-05 15:37:22 +01:00
..
ac97 ALSA: ac97: Constify more text arrays 2014-10-21 08:51:45 +02:00
ali5451 PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
asihpi ALSA: asihpi: Use snd_ctl_enum_info() 2014-10-21 08:52:13 +02:00
au88x0 ALSA: au88x0: Kill the rest snd_print*() 2014-10-28 17:40:45 +01:00
aw2 ALSA: aw2: Use snd_ctl_enum_info() 2014-10-21 08:53:43 +02:00
ca0106 ALSA: ca0106: Use snd_ctl_enum_info() 2014-10-21 08:55:04 +02:00
cs46xx PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
cs5535audio PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
ctxfi ALSA: ctxfi: Kill the rest snd_print*() 2014-10-28 17:40:42 +01:00
echoaudio ALSA: echoaudio: cleanup of unnecessary messages 2014-11-05 15:35:57 +01:00
emu10k1 ALSA: emu10k1: Deletion of unnecessary checks before three function calls 2014-11-03 15:16:14 +01:00
hda Merge branch 'for-linus' into for-next 2014-11-05 15:37:22 +01:00
ice1712 ALSA: ice1724: Use snd_ctl_enum_info() 2014-10-21 09:02:50 +02:00
korg1212 ALSA: korg1212: Use snd_ctl_enum_info() 2014-10-21 09:04:07 +02:00
lola PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
lx6464es ALSA: lx6464es: Use nonatomic PCM ops 2014-09-15 15:52:10 +02:00
mixart ALSA: mixart: Use nonatomic PCM ops 2014-09-15 15:52:09 +02:00
nm256 PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
oxygen ALSA: oxygen: set fifo_size 2014-09-22 08:57:01 +02:00
pcxhr ALSA: pcxhr: Kill the rest snd_print*() 2014-10-28 17:40:43 +01:00
riptide PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
rme9652 ALSA: hdspm: remove unused variable 2014-10-29 16:12:32 +01:00
trident PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
vx222 ALSA: vx: Use nonatomic PCM ops 2014-09-15 15:52:03 +02:00
ymfpci PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
ad1889.c ALSA: ad1889: Fix probable mask then right shift defects 2014-10-27 08:40:18 +01:00
ad1889.h
ak4531_codec.c ALSA: pci: remove __dev* attributes 2012-12-07 07:20:55 +01:00
als300.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
als4000.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
atiixp_modem.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
atiixp.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
azt3328.c ALSA: azt3328: Use snd_ctl_enum_info() 2014-10-21 08:53:54 +02:00
azt3328.h ALSA: azt3328: fix previous breakage, improve suspend, cleanups 2009-07-15 12:03:26 +02:00
bt87x.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
cmipci.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
cs4281.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
cs5530.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
ens1370.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
ens1371.c
es1938.c ALSA: es1938: Use snd_ctl_enum_info() 2014-10-21 08:59:59 +02:00
es1968.c ALSA: es1968: Replace timeval with ktime_t 2014-10-30 08:04:33 +01:00
fm801.c ALSA: fm801: Use snd_ctl_enum_info() 2014-10-21 09:00:29 +02:00
intel8x0.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
intel8x0m.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
Kconfig ALSA: virtuoso: add Xonar Essence STX II support 2014-08-04 15:20:48 +02:00
maestro3.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
Makefile ALSA: Add the driver for Digigram Lola PCI-e boards 2011-05-03 16:31:05 +02:00
rme32.c ALSA: rme32: Use snd_ctl_enum_info() 2014-10-21 09:05:24 +02:00
rme96.c ALSA: rme96: Use snd_ctl_enum_info() 2014-10-21 09:07:50 +02:00
sis7019.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06: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: sonicvibes: Use snd_ctl_enum_info() 2014-10-21 09:12:51 +02:00
via82xx_modem.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
via82xx.c ALSA: via82xx: Use snd_ctl_enum_info() 2014-10-21 09:13:24 +02:00