kernel-fxtec-pro1x/sound
David S. Miller 6e03f896b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/vxlan.c
	drivers/vhost/net.c
	include/linux/if_vlan.h
	net/core/dev.c

The net/core/dev.c conflict was the overlap of one commit marking an
existing function static whilst another was adding a new function.

In the include/linux/if_vlan.h case, the type used for a local
variable was changed in 'net', whereas the function got rewritten
to fix a stacked vlan bug in 'net-next'.

In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next'
overlapped with an endainness fix for VHOST 1.0 in 'net'.

In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter
in 'net-next' whereas in 'net' there was a bug fix to pass in the
correct network namespace pointer in calls to this function.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-02-05 14:33:28 -08: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 ALSA: seq-dummy: remove deadlock-causing events on close 2015-01-26 13:53:13 +01:00
drivers Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
firewire ALSA: firewire-lib: limit the MIDI data rate 2015-01-16 22:51:23 +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/rt5677', 'asoc/fix/simple', 'asoc/fix/ts3a227e', 'asoc/fix/wm8904' and 'asoc/fix/wm8960' into asoc-linus 2015-01-26 11:29:58 +00:00
sparc Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
spi
synth ALSA: synth: emux: soundfont.c: Cleaning up memory leak 2014-06-01 14:33:09 +02:00
usb ALSA: usb-audio: Add mic volume fix quirk for Logitech Webcam C210 2015-01-18 10:03:50 +01:00
ac97_bus.c
Kconfig
last.c
Makefile
sound_core.c
sound_firmware.c