David S. Miller 5510b3c2a1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	arch/s390/net/bpf_jit_comp.c
	drivers/net/ethernet/ti/netcp_ethss.c
	net/bridge/br_multicast.c
	net/ipv4/ip_fragment.c

All four conflicts were cases of simple overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2015-07-31 23:52:20 -07:00

..

arch

…

build

perf tools: Create config.detected into OUTPUT directory

2015-07-01 17:53:49 -03:00

cgroup

…

firewire

…

hv

…

iio

…

include

tools: Copy rbtree_augmented.h from the kernel

2015-07-05 22:59:05 -03:00

laptop/freefall

…

lguest

…

lib

tools: Copy lib/hweight.c from the kernel sources

2015-07-09 16:29:56 -03:00

net

bpf_jit_disasm: also support reading jit dump from file

2015-07-31 15:13:14 -07:00

nfsd

…

perf

perf tools: Really allow to specify custom CC, AR or LD

2015-07-15 11:57:28 -03:00

power

Merge tag 'acpica-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2015-07-02 17:11:28 -07:00

scripts

…

testing

Merge tag 'linux-kselftest-4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

2015-07-28 10:09:53 -07:00

thermal/tmon

…

time

…

usb

…

virtio

…

vm

…

Makefile

Merge tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2015-06-26 15:46:08 -07:00