summaryrefslogtreecommitdiffstats
path: root/include/net/cfg802154.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-01-12 05:55:43 +0100
committerDavid S. Miller <davem@davemloft.net>2016-01-12 05:55:43 +0100
commit9d367eddf363553c7668ba92c3b9d187ec4f71f7 (patch)
tree4f06d334d316390cc9a869ce3e74ec48d32ed0f8 /include/net/cfg802154.h
parentnet: Fix typo in netdev_intersect_features (diff)
parentbonding: Prevent IPv6 link local address on enslaved devices (diff)
downloadlinux-9d367eddf363553c7668ba92c3b9d187ec4f71f7.tar.xz
linux-9d367eddf363553c7668ba92c3b9d187ec4f71f7.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/bonding/bond_main.c drivers/net/ethernet/mellanox/mlxsw/spectrum.h drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c The bond_main.c and mellanox switch conflicts were cases of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/cfg802154.h')
0 files changed, 0 insertions, 0 deletions