stephen hemminger
dcd93ed4cd
netfilter: nf_conntrack: remove dead code ...
The following code is not used in current upstream code.
Some of this seems to be old hooks, other might be used by some
out of tree module (which I don't care about breaking), and
the need_ipv4_conntrack was used by old NAT code but no longer
called.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2014-01-03 23:41:37 +01:00
Merge branch 'acpica'
2013-11-27 01:03:27 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2013-11-23 16:18:25 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2013-11-23 16:18:25 -08:00
Merge branch 'ttm-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into drm-fixes
2013-11-21 18:46:56 +10:00
For the 3.13 merge window we have a couple of new drivers for the AMS
2013-11-15 16:37:40 -08:00
netfilter: ipset: remove unused code
2014-01-03 23:41:35 +01:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-11-18 15:50:07 -08:00
netfilter: nf_conntrack: remove dead code
2014-01-03 23:41:37 +01:00
Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'srp' into for-next
2013-11-17 08:22:19 -08:00
Main batch of InfiniBand/RDMA changes for 3.13:
2013-11-18 15:36:04 -08:00
Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-next
2013-11-08 10:43:40 +00:00
target_core_alua: Store supported ALUA states
2013-11-20 11:26:37 -08:00
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-12-02 10:13:09 -08:00
netfilter: nf_nat: add full port randomization support
2014-01-03 23:41:26 +01:00
fbdev changes for 3.13
2013-11-14 14:44:20 +09:00
Features:
2013-11-15 13:34:37 +09:00
dcd93ed4cd