David S. Miller 5b79c2af66 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of easy overlapping changes in the confict resolutions here. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-26 19:46:15 -04:00
..
accounting
arch	tools headers kvm: Sync ARM UAPI headers with the kernel sources	2018-05-07 15:23:46 -03:00
bpf	tools/bpftool: add perf subcommand	2018-05-24 18:18:20 -07:00
build	Kbuild: fix # escaping in .cmd files for future Make	2018-04-11 00:03:02 +09:00
cgroup
firewire
gpio
hv
iio
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2018-05-24 22:20:51 -04:00
kvm/kvm_stat
laptop
leds
lib	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2018-05-24 22:20:51 -04:00
memory-model
nfsd
objtool	objtool: Detect RIP-relative switch table references, part 2	2018-05-19 08:10:04 +02:00
pci
pcmcia
perf	perf tools: Add missing newline when parsing empty BPF proggie	2018-05-11 12:10:02 -03:00
power	tools: power/acpi, revert to LD = gcc	2018-05-04 11:24:22 +02:00
scripts	Kbuild: fix # escaping in .cmd files for future Make	2018-04-11 00:03:02 +09:00
spi
testing	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-26 19:46:15 -04:00
thermal/tmon
time
usb
virtio
vm
wmi
Makefile