Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  netns: fix ip_rt_frag_needed rt_is_expired
  netfilter: nf_conntrack_extend: avoid unnecessary "ct->ext" dereferences
  netfilter: fix double-free and use-after free
  netfilter: arptables in netns for real
  netfilter: ip{,6}tables_security: fix future section mismatch
  selinux: use nf_register_hooks()
  netfilter: ebtables: use nf_register_hooks()
  Revert "pkt_sched: sch_sfq: dump a real number of flows"
  qeth: use dev->ml_priv instead of dev->priv
  syncookies: Make sure ECN is disabled
  net: drop unused BUG_TRAP()
  net: convert BUG_TRAP to generic WARN_ON
  drivers/net: convert BUG_TRAP to generic WARN_ON

diff --cc drivers/net/bnx2x_main.c
Simple merge

diff --cc include/linux/slab.h
Simple merge

diff --cc mm/util.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/user_dma.c
Simple merge

diff --cc net/ipv4/af_inet.c
Simple merge

diff --cc net/ipv6/af_inet6.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge