Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 21:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
571a963768
linux/net/ieee802154
History
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 ieee802154: add wpan_phy dump support 2014-11-09 19:50:29 +01:00
header_ops.c ieee802154: move ieee802154 header 2014-10-25 21:39:57 +02:00
ieee802154.h ieee802154: add nl802154 framework 2014-11-09 19:50:29 +01:00
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 ieee802154: add nl802154 framework 2014-11-09 19:50:29 +01:00
nl_policy.c ieee802154: mac802154: remove FSF address 2014-10-25 08:07:30 +02:00
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 ieee802154: introduce sysfs file 2014-10-28 23:19:09 +01:00
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