From: David S. Miller <davem@davemloft.net>
Date: Tue, 8 Jan 2013 03:25:13 +0000 (-0800)
Subject: Merge branch 'master' of git://1984.lsi.us.es/nf
X-Git-Tag: v3.8-rc3~8^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=32fa10b24ef64b41e8ca17068fa9dc625427a05e;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

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

Pablo Neira Ayuso says:

====================
The following batch contains Netfilter fixes for 3.8-rc2, they are:

* Fix IPv6 stateless network/port translation (NPT) checksum
  calculation, from Ulrich Weber.

* Fix for xt_recent to avoid memory allocation failures if large
  hashtables are used, from Eric Dumazet.

* Fix missing dependencies in Kconfig for the deprecated NOTRACK,
  from myself.
====================

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

32fa10b24ef64b41e8ca17068fa9dc625427a05e