diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-09 09:47:59 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-09 09:47:59 (GMT) |
| commit | bb3bb3a5b839fa5c0a2c386640e865320a1fb64c (patch) | |
| tree | d051944d816c231fe824227d8012994a7bd1bbe7 /drivers/net/wireless | |
| parent | 054581e6c1eb314d54d4747fba545e9802be29da (diff) | |
| parent | 6bd0405bb4196b44f1acb7a58f11382cdaf6f7f0 (diff) | |
| download | linux-fsl-qoriq-bb3bb3a5b839fa5c0a2c386640e865320a1fb64c.tar.xz | |
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 'drivers/net/wireless')
0 files changed, 0 insertions, 0 deletions