From: Linus Torvalds Date: Thu, 1 Feb 2007 00:58:12 +0000 (-0800) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 X-Git-Tag: v3.12-rc1~31767 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=190ff5b3a168b666925897558998b5d97fec8731;p=kernel%2Fkernel-generic.git Merge /pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NETFILTER]: xt_hashlimit: fix ip6tables dependency [SCTP]: Force update of the rto when processing HB-ACK [IPV6]: fix BUG of ndisc_send_redirect() [IPV6]: Fix up some CONFIG typos [NETFILTER]: SIP conntrack: fix out of bounds memory access [NETFILTER]: SIP conntrack: fix skipping over user info in SIP headers [NETFILTER]: xt_connbytes: fix division by zero [MAINTAINERS]: netfilter@ is subscribers-only --- 190ff5b3a168b666925897558998b5d97fec8731