tree c1d94f96ebc7584c54872d1e7b6771eb3ffb59c3
parent bdfc87f7d1e253e0a61e2fc6a75ea9d76f7fc03a
parent 16af511a666827eaf5802144f09e2fb7b0942c99
author David S. Miller <davem@davemloft.net> 1347558786 -0400
committer David S. Miller <davem@davemloft.net> 1347558786 -0400

Merge branch 'master' of git://1984.lsi.us.es/nf

Pablo Neira Ayuso say:

====================
The following patchset contains four updates for your net tree, they are:

* Fix crash on timewait sockets, since the TCP early demux was added,
  in nfnetlink_log, from Eric Dumazet.

* Fix broken syslog log-level for xt_LOG and ebt_log since printk format was
  converted from <.> to a 2 bytes pattern using ASCII SOH, from Joe Perches.

* Two security fixes for the TCP connection tracking targeting off-path attacks,
  from Jozsef Kadlecsik. The problem was discovered by Jan Wrobel and it is
  documented in: http://mixedbit.org/reflection_scan/reflection_scan.pdf.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>