]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4d84cb2 7d0785a)
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)
commit93d279130ff65a25093ab0c48eae784d066bd7f1
treed051944d816c231fe824227d8012994a7bd1bbe7tree | snapshot
parent4d84cb2ecdf4419b492d3f512c71bd120dd4d3bdcommit | diff
parent7d0785a88c05290ed461a4bd83b6b0c57e349fe9commit | 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>
Linux Kernel Source Tree.