tree a67c31db4f21b740f8101e35e2f1219e93310f77
parent c7e2e1d72ed7707239d20525e0ebcad7e3303659
parent 2727de76041b2064c0b74f00a2a89678fb3efafc
author David S. Miller <davem@davemloft.net> 1357615513 -0800
committer David S. Miller <davem@davemloft.net> 1357615513 -0800

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>