From: David S. Miller <davem@davemloft.net>
Date: Wed, 25 Mar 2015 18:05:56 +0000 (-0400)
Subject: Merge branch 'tipc-next'
X-Git-Tag: omap-for-v4.1/fixes-rc1~141^2~139
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fa38a38ac37a0ca5366cd62ba4339c2bab49db9;p=pandora-kernel.git

Merge branch 'tipc-next'

Jon Maloy says:

====================
tipc: some improvements and fixes

We introduce a better algorithm for selecting when and which
users should be subject to link congestion control, plus clean
up some code for that mechanism.
Commit #3 fixes another rare race condition during packet reception.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

8fa38a38ac37a0ca5366cd62ba4339c2bab49db9