diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-09 11:47:59 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-09 11:47:59 +0200 |
| commit | bb3bb3a5b839fa5c0a2c386640e865320a1fb64c (patch) | |
| tree | d051944d816c231fe824227d8012994a7bd1bbe7 /net/appletalk | |
| parent | cnic: Don't use netdev->base_addr (diff) | |
| parent | netfilter: nf_ct_ecache: fix crash with multiple containers, one shutting down (diff) | |
| download | linux-bb3bb3a5b839fa5c0a2c386640e865320a1fb64c.tar.xz linux-bb3bb3a5b839fa5c0a2c386640e865320a1fb64c.zip | |
Merge branch 'master' of git://1984.lsi.us.es/nf
Pablo Neira Ayuso says:
====================
* One to get the timeout special parameter for the SET target back working
(this was introduced while trying to fix another bug in 3.4) from
Jozsef Kadlecsik.
* One crash fix if containers and nf_conntrack are used reported by Hans
Schillstrom by myself.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/appletalk')
0 files changed, 0 insertions, 0 deletions