WSL2-Linux-Kernel/sound
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
..
aoa ALSA: i2sbus: Deletion of unnecessary checks before the function call "release_and_free_resource" 2014-12-03 07:59:04 +01:00
arm Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
atmel Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
core Merge branch 'for-linus' into for-next 2014-11-28 18:30:19 +01:00
drivers Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
firewire ALSA: fireworks: fix an endianness bug for transaction length 2015-01-07 16:39:21 +01:00
i2c ALSA: ak4xxx-adda: Use snd_ctl_enum_info() 2014-10-21 08:29:54 +02:00
isa ALSA: sb: Deletion of unnecessary checks before two function calls 2014-11-21 20:07:36 +01:00
mips Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
oss Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
parisc ALSA: parisc: Use snd_ctl_enum_info() 2014-10-21 08:37:36 +02:00
pci Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-01-15 00:53:17 -05:00
pcmcia ALSA: vx: Fix missing kerneldoc parameter descriptions 2014-11-11 09:39:10 +01:00
ppc Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
sh ALSA: sh: drop owner assignment from platform_drivers 2014-10-20 16:22:02 +02:00
soc Merge remote-tracking branches 'asoc/fix/dwc', 'asoc/fix/intel', 'asoc/fix/rockchip' and 'asoc/fix/rt5677' into asoc-linus 2014-12-24 12:56:32 +00:00
sparc Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
spi ALSA: spi: Convert to snd_card_new() with a device pointer 2014-02-14 08:14:08 +01:00
synth ALSA: synth: emux: soundfont.c: Cleaning up memory leak 2014-06-01 14:33:09 +02:00
usb ALSA: snd-usb-caiaq: fix stream count check 2015-01-05 08:56:19 +01:00
Kconfig
Makefile
ac97_bus.c
last.c
sound_core.c consolidate the reassignments of ->f_op in ->open() instances 2013-10-24 23:34:53 -04:00
sound_firmware.c