tree 5084957e552c15d77e2171f3a168c71d97ae4d01
parent 732256b9335f8456623bb772d86c2a24e3cafca2
parent f2661adc0c134d890d84c32d7cb54a2b4d1f0a5f
author David S. Miller <davem@davemloft.net> 1389137883 -0500
committer David S. Miller <davem@davemloft.net> 1389137897 -0500

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
The following patchset contains two patches:

* fix the IRC NAT helper which was broken when adding (incomplete) IPv6
  support, from Daniel Borkmann.

* Refine the previous bugtrap that Jesper added to catch problems for the
  usage of the sequence adjustment extension in IPVs in Dec 16th, it may
  spam messages in case of finding a real bug.
====================

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