David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-23 00:09:14 -05:00
..
arch
build
cgroup
firewire
hv
iio
include
laptop/freefall
lguest
lib	Initial roundup of 4.5 merge window patches	2016-01-23 18:45:06 -08:00
net	tools, bpf_asm: simplify parser rule for BPF extensions	2016-02-22 13:29:42 -05:00
nfsd
perf	perf/urgent fix:	2016-02-04 08:56:54 +01:00
power	Merge branch 'pm-tools'	2016-01-21 00:43:29 +01:00
scripts
spi
testing	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
thermal/tmon
time
usb
virtio	tools/virtio: add ringtest utilities	2016-01-26 10:18:30 +02:00
vm
Makefile	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-01-14 11:39:09 -08:00