linux/tools
David S. Miller 5510b3c2a1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	arch/s390/net/bpf_jit_comp.c
	drivers/net/ethernet/ti/netcp_ethss.c
	net/bridge/br_multicast.c
	net/ipv4/ip_fragment.c

All four conflicts were cases of simple overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-07-31 23:52:20 -07:00
..
arch tools include: Add basic atomic.h implementation from the kernel sources 2015-05-08 16:11:05 -03:00
build perf tools: Create config.detected into OUTPUT directory 2015-07-01 17:53:49 -03:00
cgroup
firewire
hv Drivers: hv: fcopy: full handshake support 2015-05-24 12:17:42 -07:00
iio tools:iio:iio_utils: pass strings as const 2015-06-01 08:40:26 +01:00
include tools: Copy rbtree_augmented.h from the kernel 2015-07-05 22:59:05 -03:00
laptop/freefall Move freefall program from Documentation/ to tools/ 2015-06-08 16:42:07 -06:00
lguest tools/lguest: don't use legacy definitions for net device in example launcher. 2015-02-13 17:15:55 +10:30
lib tools: Copy lib/hweight.c from the kernel sources 2015-07-09 16:29:56 -03:00
net bpf_jit_disasm: also support reading jit dump from file 2015-07-31 15:13:14 -07:00
nfsd
perf perf tools: Really allow to specify custom CC, AR or LD 2015-07-15 11:57:28 -03:00
power Additional ACPICA material for v4.2-rc1 2015-07-02 17:11:28 -07:00
scripts
testing linux-kselftest-4.2-rc5 2015-07-28 10:09:53 -07: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: add virtio 1.0 in vringh_test 2014-12-15 23:49:22 +02:00
vm tools: Fix tools/vm build 2015-05-12 18:11:06 -03:00
Makefile Staging driver patches for 4.2-rc1 2015-06-26 15:46:08 -07:00