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

..

core

IB/core: Destroy multcast_idr on module exit

2015-07-14 13:20:15 -04:00

hw

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

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

ulp

Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2015-07-29 09:54:40 -07:00

Kconfig

IB/core: Implement support for MMU notifiers regarding on demand paging regions

2014-12-15 18:13:36 -08:00

Makefile

IB: Allow build of hw/ and ulp/ subdirectories independently

2014-06-02 14:51:12 -07:00