]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jul 2008 03:17:56 +0000 (20:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jul 2008 03:17:56 +0000 (20:17 -0700)
commit228428428138e231a155464239880201e5cc8b44
tree89b437f5501d03ca36b717e232337426d0de77ca
parent78681ac08a611313595d13cafabae1183b71ef48
parent6c3b8fc618905d7599dcc514c99ce4293d476f39
Merge git://git./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
drivers/net/bnx2x_main.c
include/linux/slab.h
mm/util.c
net/core/dev.c
net/core/user_dma.c
net/ipv4/af_inet.c
net/ipv6/af_inet6.c
security/selinux/hooks.c