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
..
addr.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
addr.h
atm_misc.c	net/atm/atm_misc.c: checkpatch cleanups	2010-01-26 21:15:57 -08:00
atm_sysfs.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
br2684.c	br2684: fix scheduling while atomic	2010-09-26 18:29:18 -07:00
clip.c	net neigh: RCU conversion of neigh hash table	2010-10-05 14:54:36 -07:00
common.c	net/atm: Adjust confusing if indentation	2010-08-16 21:06:26 -07:00
common.h	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
ioctl.c	net/atm/ioctl.c: checkpatch cleanups	2010-01-26 21:15:59 -08:00
Kconfig
lec.c	atm: remove a net_device_stats clear	2010-08-19 00:14:36 -07:00
lec.h	lec: convert to internal network_device_stats	2009-01-21 14:02:00 -08:00
lec_arpc.h
Makefile
mpc.c	ATM: mpc, fix use after free	2010-10-11 11:05:42 -07:00
mpc.h	atm: convert mpc device to using netdev_ops	2009-03-21 19:19:12 -07:00
mpoa_caches.c	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07:00
mpoa_caches.h
mpoa_proc.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
pppoatm.c	ppp: make channel_ops const	2010-08-04 21:53:17 -07:00
proc.c	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
protocols.h
pvc.c	net/atm/pvc.c: checkpatch cleanups	2010-01-26 21:16:02 -08:00
raw.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
resources.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
resources.h	atm: 32-bit ioctl compatibility	2008-12-03 22:12:38 -08:00
signaling.c	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
signaling.h
svc.c	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00