]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'master' of git://1984.lsi.us.es/nf
authorDavid S. Miller <davem@davemloft.net>
Tue, 8 Jan 2013 03:25:13 +0000 (19:25 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 Jan 2013 03:25:13 +0000 (19:25 -0800)
commit32fa10b24ef64b41e8ca17068fa9dc625427a05e
treea67c31db4f21b740f8101e35e2f1219e93310f77
parentc7e2e1d72ed7707239d20525e0ebcad7e3303659
parent2727de76041b2064c0b74f00a2a89678fb3efafc
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>