Linus Torvalds 5f05647dd8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1699 commits) bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL. vlan: Calling vlan_hwaccel_do_receive() is always valid. tproxy: use the interface primary IP address as a default value for --on-ip tproxy: added IPv6 support to the socket match cxgb3: function namespace cleanup tproxy: added IPv6 support to the TPROXY target tproxy: added IPv6 socket lookup function to nf_tproxy_core be2net: Changes to use only priority codes allowed by f/w tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled tproxy: added tproxy sockopt interface in the IPV6 layer tproxy: added udp6_lib_lookup function tproxy: added const specifiers to udp lookup functions tproxy: split off ipv6 defragmentation to a separate module l2tp: small cleanup nf_nat: restrict ICMP translation for embedded header can: mcp251x: fix generation of error frames can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set can-raw: add msg_flags to distinguish local traffic 9p: client code cleanup rds: make local functions/variables static ... Fix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and drivers/net/wireless/ath/ath9k/debug.c as per David		2010-10-23 11:47:02 -07:00
..
ccids	dccp: remove unused argument in CCID tx function	2010-10-12 06:57:41 +02:00
ackvec.c	net: dccp: fix sign bug	2010-07-18 15:07:14 -07:00
ackvec.h	dccp: Minimise header option overhead in setting the MPS	2009-03-02 03:07:23 -08:00
ccid.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ccid.h	dccp: remove unused argument in CCID tx function	2010-10-12 06:57:41 +02:00
dccp.h	dccp: schedule an Ack when receiving timestamps	2010-10-12 06:57:43 +02:00
diag.c	dccp_diag: LISTEN sockets don't have CCIDs	2008-12-17 16:08:01 -08:00
feat.c	dccp: Kill dead code and add static markers.	2010-10-06 23:12:07 -07:00
feat.h	dccp: Kill dead code and add static markers.	2010-10-06 23:12:07 -07:00
input.c	dccp: cosmetics - warning format	2010-10-12 06:57:43 +02:00
ipv4.c	tproxy: fix hash locking issue when using port redirection in __inet_inherit_port()	2010-10-21 13:06:43 +02:00
ipv6.c	tproxy: fix hash locking issue when using port redirection in __inet_inherit_port()	2010-10-21 13:06:43 +02:00
ipv6.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
Kconfig	dccp: Lockless integration of CCID congestion-control plugins	2009-01-04 21:42:53 -08:00
Makefile	dccp: Integrate the TFRC library with DCCP	2009-01-04 21:45:33 -08:00
minisocks.c	dccp: fix the adjustments to AWL and SWL	2010-10-12 06:57:40 +02:00
options.c	dccp: schedule an Ack when receiving timestamps	2010-10-12 06:57:43 +02:00
output.c	dccp: remove unused argument in CCID tx function	2010-10-12 06:57:41 +02:00
probe.c	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
proto.c	dccp: cosmetics - warning format	2010-10-12 06:57:43 +02:00
sysctl.c	sysctl net: Remove unused binary sysctl code	2009-11-12 02:05:06 -08:00
timer.c	net: sk_dst_cache RCUification	2010-04-13 01:41:33 -07:00