Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
The following patchset contains three Netfilter fixes and update
for the MAINTAINER file for your net tree, they are:

* Fix crash if nf_log_packet is called from conntrack, in that case
  both interfaces are NULL, from Hans Schillstrom. This bug introduced
  with the logging netns support in the previous merge window.

* Fix compilation of nf_log and nf_queue without CONFIG_PROC_FS,
  from myself. This bug was introduced in the previous merge window
  with the new netns support for the netfilter logging infrastructure.

* Fix possible crash in xt_TCPOPTSTRIP due to missing sanity
  checkings to validate that the TCP header is well-formed, from
  myself. I can find this bug in 2.6.25, probably it's been there
  since the beginning. I'll pass this to -stable.

* Update MAINTAINER file to point to new nf trees at git.kernel.org,
  remove Harald and use M: instead of P: (now obsolete tag) to
  keep Jozsef in the list of people.

Please, consider pulling this. Thanks!
====================

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

diff --combined MAINTAINERS
index 3d7782b9f90d80d171c97e1d15371a9e2ec51ddc,32aad62b3a6a0ac0e25f9727526bc596847ab18e..50955f90ed7e6ea10293f490c7240bf6ea67513f
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1620,13 -1620,6 +1620,13 @@@ W:    http://www.baycom.org/~tom/ham/ham.h
  S:    Maintained
  F:    drivers/net/hamradio/baycom*
  
 +BCACHE (BLOCK LAYER CACHE)
 +M:    Kent Overstreet <koverstreet@google.com>
 +L:    linux-bcache@vger.kernel.org
 +W:    http://bcache.evilpiepirate.org
 +S:    Maintained:
 +F:    drivers/md/bcache/
 +
  BEFS FILE SYSTEM
  S:    Orphan
  F:    Documentation/filesystems/befs.txt
@@@ -5509,18 -5502,18 +5509,18 @@@ F:   Documentation/networking/s2io.tx
  F:    Documentation/networking/vxge.txt
  F:    drivers/net/ethernet/neterion/
  
- NETFILTER/IPTABLES/IPCHAINS
- P:    Harald Welte
- P:    Jozsef Kadlecsik
+ NETFILTER/IPTABLES
  M:    Pablo Neira Ayuso <pablo@netfilter.org>
  M:    Patrick McHardy <kaber@trash.net>
+ M:    Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
  L:    netfilter-devel@vger.kernel.org
  L:    netfilter@vger.kernel.org
  L:    coreteam@netfilter.org
  W:    http://www.netfilter.org/
  W:    http://www.iptables.org/
- T:    git git://1984.lsi.us.es/nf
- T:    git git://1984.lsi.us.es/nf-next
+ Q:    http://patchwork.ozlabs.org/project/netfilter-devel/list/
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
  S:    Supported
  F:    include/linux/netfilter*
  F:    include/linux/netfilter/
@@@ -6723,14 -6716,6 +6723,14 @@@ F:    drivers/remoteproc
  F:    Documentation/remoteproc.txt
  F:    include/linux/remoteproc.h
  
 +REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
 +M:    Ohad Ben-Cohen <ohad@wizery.com>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git
 +S:    Maintained
 +F:    drivers/rpmsg/
 +F:    Documentation/rpmsg.txt
 +F:    include/linux/rpmsg.h
 +
  RFKILL
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linux-wireless@vger.kernel.org
@@@ -7155,9 -7140,9 +7155,9 @@@ F:      drivers/misc/phantom.
  F:    include/uapi/linux/phantom.h
  
  SERIAL ATA (SATA) SUBSYSTEM
 -M:    Jeff Garzik <jgarzik@pobox.com>
 +M:    Tejun Heo <tj@kernel.org>
  L:    linux-ide@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
  S:    Supported
  F:    drivers/ata/
  F:    include/linux/ata.h
@@@ -8029,14 -8014,11 +8029,14 @@@ F:   arch/xtensa
  
  THERMAL
  M:      Zhang Rui <rui.zhang@intel.com>
 +M:      Eduardo Valentin <eduardo.valentin@ti.com>
  L:      linux-pm@vger.kernel.org
  T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
 +Q:      https://patchwork.kernel.org/project/linux-pm/list/
  S:      Supported
  F:      drivers/thermal/
  F:      include/linux/thermal.h
 +F:      include/linux/cpu_cooling.h
  
  THINGM BLINK(1) USB RGB LED DRIVER
  M:    Vivien Didelot <vivien.didelot@savoirfairelinux.com>