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

tools build: Add BPF feature check to test-all

2016-01-11 19:22:21 -03:00

cgroup

…

firewire

…

hv

tools: hv: vss: fix the write()'s argument: error -> vss_msg

2015-12-14 19:15:05 -08:00

iio

iio: generic_buffer: be helpful about enabling channels

2015-08-16 10:51:26 +01:00

include

tools: Make list.h self-sufficient

2016-01-12 12:42:07 -03:00

laptop/freefall

Move freefall program from Documentation/ to tools/

2015-06-08 16:42:07 -06:00

lguest

tools/lguest: Clean up include dir

2015-08-26 06:12:35 +02:00

lib

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

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

Merge tag 'perf-urgent-for-mingo-2' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

2016-02-04 08:56:54 +01:00

power

Merge branch 'pm-tools'

2016-01-21 00:43:29 +01:00

scripts

tools: Move Makefile.arch from perf/config to tools/scripts

2016-01-11 19:22:20 -03:00

spi

spi: spidev_test: Fix typo in error message

2015-12-08 17:58:56 +00:00

testing

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-02-23 00:09:14 -05:00

thermal/tmon

tools/thermal: tmon: use pkg-config also for CFLAGS

2015-10-10 11:32:31 +08:00

time

…

usb

Merge tag 'usb-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

2015-10-22 17:19:33 -07:00

virtio

tools/virtio: add ringtest utilities

2016-01-26 10:18:30 +02:00

vm

tools/vm/page-types.c: support KPF_IDLE

2015-11-20 16:17:32 -08:00

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