WSL2-Linux-Kernel/sound/pci
David S. Miller 3f3558bb51 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/xen-netfront.c

Minor overlapping changes in xen-netfront.c, mostly to do
with some buffer management changes alongside the split
of stats into TX and RX.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-15 00:53:17 -05: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: update to HPI version 4.14 2014-12-18 08:48:47 +01: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: Neaten get_daio_rsc 2014-12-03 20:30:04 +01:00
echoaudio ALSA: echoaudio: Deletion of a check before release_and_free_resource() 2014-12-02 18:40:22 +01:00
emu10k1 ALSA: Fix invalid kerneldoc markers 2014-11-11 09:39:17 +01:00
hda Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-01-15 00:53:17 -05:00
ice1712 ALSA: ice17xx: Deletion of unnecessary checks before the function call "snd_ac97_resume" 2014-11-17 13:45:51 +01:00
korg1212 ALSA: korg1212: Use snd_ctl_enum_info() 2014-10-21 09:04:07 +02:00
lola ALSA: lola: NULL dereference on probe failure 2014-12-10 14:45:15 +01:00
lx6464es ALSA: Fix invalid kerneldoc markers 2014-11-11 09:39:17 +01:00
mixart ALSA: mixart: Fix kerneldoc comments 2014-11-11 09:39:13 +01: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: NULL dereference on probe failure 2014-12-10 14:45:22 +01:00
riptide PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00
rme9652 ALSA: hdsp: Deletion of an unnecessary check before the function call "release_firmware" 2014-11-17 13:46:46 +01:00
trident ALSA: trident: Deletion of a check before snd_util_memhdr_free() 2014-12-02 20:10:42 +01:00
vx222 ALSA: vx: Fix missing kerneldoc parameter descriptions 2014-11-11 09:39:10 +01:00
ymfpci 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
Makefile
ad1889.c ALSA: ad1889: Fix probable mask then right shift defects 2014-10-27 08:40:18 +01:00
ad1889.h
ak4531_codec.c
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.c ALSA: pcm: Add snd_pcm_stop_xrun() helper 2014-11-09 18:20:40 +01:00
atiixp_modem.c ALSA: pcm: Add snd_pcm_stop_xrun() helper 2014-11-09 18:20:40 +01:00
azt3328.c ALSA: azt3328: Use snd_ctl_enum_info() 2014-10-21 08:53:54 +02:00
azt3328.h
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
maestro3.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06: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
sonicvibes.c ALSA: sonicvibes: Use snd_ctl_enum_info() 2014-10-21 09:12:51 +02:00
via82xx.c ALSA: via82xx: Use snd_ctl_enum_info() 2014-10-21 09:13:24 +02:00
via82xx_modem.c PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use 2014-08-12 12:15:14 -06:00