David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -04:00
..
accounting	tools: move accounting tool from Documentation	2016-09-23 13:07:15 -06:00
arch	tools/include: Sync kernel ABI headers with tooling headers	2017-05-24 09:00:21 +02:00
build	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-05-15 15:50:49 -07:00
cgroup
firewire
gpio	gpio-hammer: fix make consumer_label suitable to work on gpio-nails	2017-01-26 16:29:09 +01:00
hv	tools: hv: set hotplug for VF on Suse	2017-06-02 14:16:15 -04:00
iio	iio: Add channel for Gravity	2017-01-05 13:02:25 +00:00
include	bpf: add bpf_set_hash helper for tc progs	2017-06-10 19:05:47 -04:00
kvm/kvm_stat	tools/kvm_stat: add '%Total' column	2017-03-29 12:01:33 +02:00
laptop	tools: move laptops dslm tool from Documentation	2016-09-23 13:07:21 -06:00
leds	tools/leds: Add led_hw_brightness_mon program	2017-02-14 22:20:23 +01:00
lguest	Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-05-01 20:51:12 -07:00
lib	bpf: Test for bpf ID	2017-06-06 15:41:24 -04:00
net	tools: bpf_jit_disasm: Handle large images.	2017-06-14 15:03:22 -04:00
nfsd
objtool	objtool: Drop ARRAY_SIZE() definition, tools/include/linux/kernel.h has it now	2017-04-19 13:01:44 -03:00
pci	tools: PCI: Add sample test script to invoke pcitest	2017-04-28 10:23:20 -05:00
pcmcia	tools: move pcmcia crc32hash tool from Documentation	2016-09-23 13:07:27 -06:00
perf	perf symbols: Kill dso__build_id_is_kmod()	2017-06-08 15:39:34 -03:00
power	Merge branches 'acpi-button' and 'acpi-tools'	2017-05-22 20:29:06 +02:00
scripts	tools arch x86: Include asm/cmpxchg.h	2017-03-03 19:07:13 -03:00
spi	spi: spidev_test: add option to continuously transfer data	2017-03-21 18:44:40 +00:00
testing	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
thermal/tmon
time
usb	usb: fix some references for /proc/bus/usb	2017-04-18 16:54:19 +02:00
virtio	tools/virtio: fix spelling mistake: "wakeus" -> "wakeups"	2017-05-09 16:43:24 +03:00
vm	tools/vm: add missing Makefile rules	2017-02-22 16:41:26 -08:00
Makefile	tools/kvm: fix top level makefile	2017-05-03 16:30:25 +02:00