David S. Miller 3efa70d78f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-02-07 16:29:30 -05:00
..
accounting
arch
build	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2016-12-17 16:24:13 -08:00
cgroup
firewire
gpio	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2016-12-17 16:24:13 -08:00
hv
iio
include	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-12-23 16:49:12 -08:00
kvm/kvm_stat
laptop
leds
lguest
lib	lib, traceevent: add PRINT_HEX_STR variant	2017-01-25 13:17:47 -05:00
net
nfsd
objtool	objtool: Fix IRET's opcode	2017-01-19 08:39:44 +01:00
pcmcia
perf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-01-28 10:33:06 -05:00
power	Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2016-12-25 14:01:28 -08:00
scripts
spi
testing	bpf: enable verifier to add 0 to packet ptr	2017-02-06 22:50:04 -05:00
thermal/tmon
time
usb
virtio	tools/virtio/ringtest: tweaks for s390	2017-01-19 23:46:32 +02:00
vm
Makefile