From: David S. Miller <davem@davemloft.net>
Date: Tue, 7 Jan 2014 23:38:03 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a04c0e2c0d4f284503fc1249bb4d2d7064c0bd0c;p=deliverable%2Flinux.git

Merge branch 'master' of git://git./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>
---

a04c0e2c0d4f284503fc1249bb4d2d7064c0bd0c