David S. Miller 9f0d34bc34 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c drivers/net/usb/sr9800.c drivers/net/usb/usbnet.c include/linux/usb/usbnet.h net/ipv4/tcp_ipv4.c net/ipv6/tcp_ipv6.c The TCP conflicts were overlapping changes. In 'net' we added a READ_ONCE() to the socket cached RX route read, whilst in 'net-next' Eric Dumazet touched the surrounding code dealing with how mini sockets are handled. With USB, it's a case of the same bug fix first going into net-next and then I cherry picked it back into net. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-04-02 16:16:53 -04:00
..
cgroup	cgroups: fix cgroup_event_listener error handling	2013-01-08 10:00:44 -08:00
firewire	tools/firewire: nosy-dump: check for allocation failure	2012-12-02 20:10:18 +01:00
hv	Tools: hv: do not add redundant '/' in hv_start_fcopy()	2015-01-25 09:17:57 -08:00
include	tools: Remove bitops/hweight usage of bits in tools/perf	2015-01-16 17:49:29 -03:00
lguest	tools/lguest: don't use legacy definitions for net device in example launcher.	2015-02-13 17:15:55 +10:30
lib	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-02-09 15:43:55 -08:00
net	tools: bpf_asm: cleanup vlan extension related token	2015-03-24 21:21:41 -04:00
nfsd
perf	perf annotate: Fix fallback to unparsed disassembler line	2015-03-05 15:27:28 -03:00
power	Revert "cpupower Makefile change to help run the tool without 'make install'"	2015-03-11 21:56:49 +01:00
scripts	tools lib traceevent: Add global QUIET_CC_FPIC build output	2013-12-19 16:18:10 -03:00
testing	selftests: Fix build failures when invoked from kselftest target	2015-03-19 09:54:55 -06:00
thermal/tmon	tools/thermal: tmon: silence 'set but not used' warnings	2015-02-28 13:52:48 +08:00
time	tools: add script to test udelay	2014-07-23 10:16:38 -07:00
usb	tools: ffs-aio-example: use endpoint addresses from descriptors	2015-01-15 09:41:49 -06:00
virtio	tools/virtio: add virtio 1.0 in vringh_test	2014-12-15 23:49:22 +02:00
vm	mm:add KPF_ZERO_PAGE flag for /proc/kpageflags	2015-02-11 17:06:00 -08:00
Makefile	tools/liblockdep: Build liblockdep from tools/Makefile	2014-05-08 13:34:45 -04:00