linux-stable/tools
David S. Miller 101c431492 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/broadcom/genet/bcmgenet.c
	net/core/sock.c

Conflicts were overlapping changes in bcmgenet and the
lockdep handling of sockets.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-03-15 11:59:10 -07:00
..
accounting
arch
build
cgroup
firewire
gpio
hv
iio
include selftests/bpf: fix broken build 2017-03-12 23:48:41 -07:00
kvm/kvm_stat
laptop
leds
lguest scripts/spelling.txt: add "overide" pattern and fix typo instances 2017-03-09 17:01:09 -08:00
lib scripts/spelling.txt: add "overide" pattern and fix typo instances 2017-03-09 17:01:09 -08:00
net
nfsd
objtool
pcmcia
perf
power
scripts
spi
testing Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-03-14 21:31:23 -07:00
thermal/tmon
time
usb
virtio
vm
Makefile