Merge branch 'tipc-next'
authorDavid S. Miller <davem@davemloft.net>
Tue, 8 Jul 2014 02:55:49 +0000 (19:55 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 Jul 2014 02:55:49 +0000 (19:55 -0700)
commit8e6e85e606c9472fca7504f231585e7760841628
tree321f71bfb9e45193a99318225ba1b9b3944c0ff1
parent86c6a2c75ab97fe31844985169e26aea335432f9
parent3f53bd8f8b563cc6024d25c1665d8358745f48b2
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>