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
..
lmc	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
.gitignore
c101.c	drivers/net/wan: Adjust confusing if indentation	2010-08-16 21:06:25 -07:00
cosa.c	net: Wan/cosa.c: Convert "mutex" to semaphore	2010-10-12 17:36:09 +02:00
cosa.h
cycx_drv.c	wan: make read-only data const	2010-09-06 13:32:20 -07:00
cycx_main.c	wan: make read-only data const	2010-09-06 13:32:20 -07:00
cycx_x25.c	X25: Use identifiers for cyclades device to x25 interface	2010-04-22 16:12:50 -07:00
dlci.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
dscc4.c	net: trans_start cleanups	2010-05-10 05:01:31 -07:00
farsync.c	farsync: Fix compile warnings.	2010-08-10 00:06:58 -07:00
farsync.h
hd64570.c	net: trans_start cleanups	2010-05-10 05:01:31 -07:00
hd64570.h	drivers/net: use __packed annotation	2010-06-03 03:18:23 -07:00
hd64572.c	net: trans_start cleanups	2010-05-10 05:01:31 -07:00
hd64572.h
hdlc_cisco.c	ipv4: ip_ptr cleanups	2010-09-15 22:06:05 -07:00
hdlc_fr.c	drivers/net: use __packed annotation	2010-06-03 03:18:23 -07:00
hdlc_ppp.c
hdlc_raw_eth.c
hdlc_raw.c
hdlc_x25.c	X25: Use identifiers for hdlc x25 device to x25 interface	2010-04-22 16:12:51 -07:00
hdlc.c
hostess_sv11.c
ixp4xx_hss.c	Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6	2010-08-11 09:17:27 -07:00
Kconfig
lapbether.c	wan: make read-only data const	2010-09-06 13:32:20 -07:00
Makefile
n2.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
pc300_drv.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
pc300_tty.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
pc300-falc-lh.h
pc300.h
pc300too.c
pci200syn.c	drivers/net/wan: Adjust confusing if indentation	2010-08-16 21:06:25 -07:00
sbni.c
sbni.h
sdla.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
sealevel.c
wanxl.c	net: trans_start cleanups	2010-05-10 05:01:31 -07:00
wanxl.h
wanxlfw.inc_shipped
wanxlfw.S
x25_asy.c	drivers/net: return operator cleanup	2010-09-26 18:34:29 -07:00
x25_asy.h
z85230.c	wan: make read-only data const	2010-09-06 13:32:20 -07:00
z85230.h