summaryrefslogtreecommitdiff
path: root/net/ieee802154/nl-phy.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-07-08 06:55:49 +0400
committerDavid S. Miller <davem@davemloft.net>2014-07-08 06:55:49 +0400
commit8e6e85e606c9472fca7504f231585e7760841628 (patch)
tree321f71bfb9e45193a99318225ba1b9b3944c0ff1 /net/ieee802154/nl-phy.c
parent86c6a2c75ab97fe31844985169e26aea335432f9 (diff)
parent3f53bd8f8b563cc6024d25c1665d8358745f48b2 (diff)
downloadlinux-8e6e85e606c9472fca7504f231585e7760841628.tar.xz
Merge branch 'tipc-next'
Erik Hugne says: ==================== tipc: link state processing improvements Message delivery is separated from the link state processing, and we fix a bug in receive-path triggered acks. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ieee802154/nl-phy.c')
0 files changed, 0 insertions, 0 deletions