From: David S. Miller <davem@davemloft.net>
Date: Mon, 20 Aug 2012 09:44:29 +0000 (-0700)
Subject: Merge git://1984.lsi.us.es/nf
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6c71bec66ae65305ba5c33c93aa722f21f092737;p=openwrt%2Fstaging%2Fblogic.git

Merge git://1984.lsi.us.es/nf

Pable Neira Ayuso says:

====================
The following five patches contain fixes for 3.6-rc, they are:

* Two fixes for message parsing in the SIP conntrack helper, from
  Patrick McHardy.

* One fix for the SIP helper introduced in the user-space cthelper
  infrastructure, from Patrick McHardy.

* fix missing appropriate locking while modifying one conntrack entry
  from the nfqueue integration code, from myself.

* fix possible access to uninitiliazed timer in the nf_conntrack
  expectation infrastructure, from myself.
====================

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

6c71bec66ae65305ba5c33c93aa722f21f092737