From: David S. Miller <davem@davemloft.net>
Date: Thu, 13 Sep 2012 18:24:31 +0000 (-0400)
Subject: Merge branch 'master' of git://1984.lsi.us.es/nf-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b0e61d98c672a9216d72d2d7430f6dc60795002e;p=linux-beck.git

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

Pablo Neira Ayuso says:

====================
The following patchset contains four Netfilter updates, mostly targeting
to fix issues added with IPv6 NAT, and one little IPVS update for net-next:

* Remove unneeded conditional free of skb in nfnetlink_queue, from
  Wei Yongjun.

* One semantic path from coccinelle detected the use of list_del +
  INIT_LIST_HEAD, instead of list_del_init, again from Wei Yongjun.

* Fix out-of-bound memory access in the NAT address selection, from
  Florian Westphal. This was introduced with the IPv6 NAT patches.

* Two fixes for crashes that were introduced in the recently merged
  IPv6 NAT support, from myself.
====================

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

b0e61d98c672a9216d72d2d7430f6dc60795002e