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
arch
build
cgroup
firewire
gpio
hv	tools: hv: set hotplug for VF on Suse	2017-06-02 14:16:15 -04:00
iio
include	bpf: add bpf_set_hash helper for tc progs	2017-06-10 19:05:47 -04:00
kvm/kvm_stat
laptop
leds
lguest
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
pci
pcmcia
perf	perf symbols: Kill dso__build_id_is_kmod()	2017-06-08 15:39:34 -03:00
power
scripts
spi
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
virtio
vm
Makefile