Merge branch 'next' branch that contains new features scheduled for

Linux kernel 3.7

diff --cc extensions/GNUmakefile.in
index 1cef239ca34c23084773faacee16954bcff07c0c,2492d184cc1cb617055a7413824b9de7199f0ab8..e71e3ff937c85763ce82294c4930b5f00dc4f8b9
--- 1/extensions/GNUmakefile.in
--- 2/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@@ -95,12 -96,8 +95,13 @@@ lib%.so: lib%.o
  lib%.oo: ${srcdir}/lib%.c
        ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
  
 +libxt_NOTRACK.so: libxt_CT.so
 +      ln -fs $< $@
 +libxt_state.so: libxt_conntrack.so
 +      ln -fs $< $@
 +
  # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
+ ip6t_NETMAP_LIBADD  = -lip6tc
  xt_RATEEST_LIBADD   = -lm
  xt_statistic_LIBADD = -lm