diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-20 11:44:29 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-20 11:44:29 +0200 |
| commit | 6c71bec66ae65305ba5c33c93aa722f21f092737 (patch) | |
| tree | ab07e16e8047bea8343d6ad34f0d5377f369aef4 /net/caif | |
| parent | af_packet: don't emit packet on orig fanout group (diff) | |
| parent | netfilter: nf_ct_expect: fix possible access to uninitialized timer (diff) | |
| download | linux-6c71bec66ae65305ba5c33c93aa722f21f092737.tar.xz linux-6c71bec66ae65305ba5c33c93aa722f21f092737.zip | |
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>
Diffstat (limited to 'net/caif')
0 files changed, 0 insertions, 0 deletions