David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06:08:27 -07:00
..
arch	tools include: Add basic atomic.h implementation from the kernel sources	2015-05-08 16:11:05 -03:00
build	tools build: Add test for presence of __get_cpuid() gcc builtin	2015-09-17 13:14:35 -03: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: add a python script lsvmbus to list VMBus devices	2015-08-05 11:44:29 -07:00
iio	iio: lsiio: fix error code handling error	2015-08-12 19:26:22 +01:00
include	tools: Restore export.h	2015-08-25 09:44:22 +02:00
laptop/freefall	Move freefall program from Documentation/ to tools/	2015-06-08 16:42:07 -06:00
lguest	tools/lguest: Clean up include dir	2015-08-26 06:12:35 +02:00
lib	tools lib traceevent: Fix string handling in heterogeneous arch environments	2015-09-22 11:57:04 -03:00
net	tools: bpf_jit_disasm: make get_last_jit_image return unsigned	2015-09-28 22:18:01 -07:00
nfsd
perf	perf tools: Fix build break on powerpc due to sample_reg_masks	2015-10-07 10:20:08 -03:00
power	tools/power turbosat: update version number	2015-09-26 09:49:55 -04:00
scripts	tools lib traceevent: Add global QUIET_CC_FPIC build output	2013-12-19 16:18:10 -03:00
testing	selftests/powerpc: Fix build failure of load_unaligned_zeropad test	2015-10-13 15:08:37 +11:00
thermal/tmon	tools/thermal: tmon: fixed the 'make install' command	2015-05-09 13:36:58 +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: propagate V=X to kernel build	2015-09-16 12:48:07 +03:00
vm	pagemap: add mmap-exclusive bit for marking pages mapped only here	2015-09-08 15:35:28 -07:00
Makefile	Staging driver patches for 4.2-rc1	2015-06-26 15:46:08 -07:00