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

..

6lowpan

inet: frag: change *_frag_mem_limit functions to take netns_frags as argument

2015-07-26 21:00:14 -07:00

core.c

mac802154: remove pib lock

2015-05-23 17:57:08 +02:00

core.h

…

header_ops.c

…

ieee802154.h

…

Kconfig

ieee802154: create 6lowpan sub-directory

2015-01-08 07:25:59 +01:00

Makefile

ieee802154: Add trace events for rdev->ops

2015-04-30 18:48:09 +02:00

netlink.c

netlink: make nlmsg_end() and genlmsg_end() void

2015-01-18 01:03:45 -05:00

nl802154.c

nl802154: export supported commands

2015-06-04 12:27:15 +02:00

nl802154.h

…

nl_policy.c

…

nl-mac.c

ieee802154: Remove 802.15.4/6LoWPAN checks for interface MTU.

2015-05-26 20:26:09 +02:00

nl-phy.c

mac802154: remove pib lock

2015-05-23 17:57:08 +02:00

rdev-ops.h

cfg802154: add PM hooks

2015-07-23 17:10:49 +02:00

socket.c

ieee802154: Fix sockaddr_ieee802154 implicit padding information leak.

2015-06-04 12:26:58 +02:00

sysfs.c

cfg802154: add PM hooks

2015-07-23 17:10:49 +02:00

sysfs.h

…

trace.c

ieee802154: Add trace events for rdev->ops

2015-04-30 18:48:09 +02:00

trace.h

cfg802154: add PM hooks

2015-07-23 17:10:49 +02:00