David S. Miller fb796707d7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Both conflict were simple overlapping changes. In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the conversion of the driver in net-next to use in-netdev stats. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-21 20:23:53 -07:00
..
accounting
arch	Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-02-20 14:37:08 -08:00
build	perf build: Add special fixdep cleaning rule	2017-02-17 16:04:38 -03:00
cgroup
firewire
gpio
hv	tools: hv: Add clean up function for Ubuntu config	2017-03-06 17:10:40 -08:00
iio
include	bpf: add napi_id read access to __sk_buff	2017-04-21 13:53:27 -04:00
kvm/kvm_stat
laptop
leds	tools/leds: Add led_hw_brightness_mon program	2017-02-14 22:20:23 +01:00
lguest	scripts/spelling.txt: add "overide" pattern and fix typo instances	2017-03-09 17:01:09 -08:00
lib	tools/lib/bpf: expose bpf_program__set_type()	2017-04-01 12:45:57 -07:00
net	tools: bpf_jit_disasm: Add option to dump JIT image to a file.	2017-04-13 13:04:03 -04:00
nfsd
objtool	objtool: Fix another GCC jump table detection issue	2017-03-07 08:42:55 +01:00
pcmcia
perf	perf/urgent annotate fix for s390:	2017-04-11 21:41:39 +02:00
power	cpupower: Fix turbo frequency reporting for pre-Sandy Bridge cores	2017-04-13 14:51:10 +02:00
scripts
spi
testing	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
thermal/tmon
time
usb
virtio
vm	tools/vm: add missing Makefile rules	2017-02-22 16:41:26 -08:00
Makefile