projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 054581e 6bd0405)
Merge branch 'master' of git://1984.lsi.us.es/nf
authorDavid S. Miller <davem@davemloft.net>
Mon, 9 Jul 2012 09:47:59 +0000 (02:47 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 Jul 2012 09:47:59 +0000 (02:47 -0700)
commitbb3bb3a5b839fa5c0a2c386640e865320a1fb64c
treed051944d816c231fe824227d8012994a7bd1bbe7tree | snapshot (tar.gz zip)
parent054581e6c1eb314d54d4747fba545e9802be29dacommit | diff
parent6bd0405bb4196b44f1acb7a58f11382cdaf6f7f0commit | diff
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>
Motorola kernel-slsi