linux/net/ieee802154
David S. Miller b04096ff33 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Four minor merge conflicts:

1) qca_spi.c renamed the local variable used for the SPI device
   from spi_device to spi, meanwhile the spi_set_drvdata() call
   got moved further up in the probe function.

2) Two changes were both adding new members to codel params
   structure, and thus we had overlapping changes to the
   initializer function.

3) 'net' was making a fix to sk_release_kernel() which is
   completely removed in 'net-next'.

4) In net_namespace.c, the rtnl_net_fill() call for GET operations
   had the command value fixed, meanwhile 'net-next' adjusted the
   argument signature a bit.

This also matches example merge resolutions posted by Stephen
Rothwell over the past two days.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-05-13 14:31:43 -04:00
..
6lowpan ieee802154: 6lowpan: fix ARPHRD to ARPHRD_6LOWPAN 2015-03-14 17:11:30 +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
core.c ieee802154: change wpan-phy name to phy 2015-03-14 17:11:30 +01: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
netlink.c netlink: make nlmsg_end() and genlmsg_end() void 2015-01-18 01:03:45 -05:00
nl-mac.c ieee802154: don't export static symbol 2015-03-14 17:11:31 +01:00
nl-phy.c cfg802154: pass name_assign_type to rdev_add_virtual_intf() 2015-04-30 18:48:10 +02:00
nl802154.c cfg802154: pass name_assign_type to rdev_add_virtual_intf() 2015-04-30 18:48:10 +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
rdev-ops.h cfg802154: pass name_assign_type to rdev_add_virtual_intf() 2015-04-30 18:48:10 +02:00
socket.c net: Pass kern from net_proto_family.create to sk_alloc 2015-05-11 10:50:17 -04:00
sysfs.c ieee802154: remove deprecated sysfs entries 2015-03-14 17:11:30 +01: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 ieee802154: trace: fix endian convertion 2015-04-30 18:48:11 +02:00