tree 8ee8e13183bc1852073e9a592780f069d73954f5
parent dfbce08c19cba2ba4faaf8c0dd6d7678f46c78dd
parent 8e36c4b5b673edc6081599b8bd461e062e4910f4
author David S. Miller <davem@davemloft.net> 1340496610 -0700
committer David S. Miller <davem@davemloft.net> 1340496610 -0700

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

Pablo says:

====================
The following four patches provide Netfilter fixes for the cthelper
infrastructure that was recently merged mainstream, they are:

* two fixes for compilation breakage with two different configurations:

  - CONFIG_NF_NAT=m and CONFIG_NF_CT_NETLINK=y
  - NF_CONNTRACK_EVENTS=n and CONFIG_NETFILTER_NETLINK_QUEUE_CT=y

* two fixes for sparse warnings.
====================

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