Merge bk://kernel.bkbits.net/davem/net-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

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

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

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

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

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

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

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