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
..
datagram.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
dev_addr_lists.c
dev.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
drop_monitor.c
dst.c	net: avoid RCU for NOCACHE dst	2010-10-20 03:02:23 -07:00
ethtool.c	ethtool: Add support for vlan accleration.	2010-10-21 01:26:54 -07:00
fib_rules.c	fib: remove a useless synchronize_rcu() call	2010-10-16 11:13:22 -07:00
filter.c	net: sk_{detach|attach}_filter() rcu fixes	2010-09-27 21:30:44 -07:00
flow.c	net: return operator cleanup	2010-09-23 14:33:39 -07:00
gen_estimator.c	pkt_sched: remov unnecessary bh_disable	2010-09-10 12:47:59 -07:00
gen_stats.c
iovec.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-04 11:56:38 -07:00
kmap_skb.h
link_watch.c
Makefile
neighbour.c	net/neighbour: cancel_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_sync()	2010-10-21 04:25:48 -07:00
net_namespace.c
net-sysfs.c	net: Fix rxq ref counting	2010-10-08 14:34:32 -07:00
net-sysfs.h	net: Allow changing number of RX queues after device allocation	2010-09-27 22:09:49 -07:00
net-traces.c	netdev: Add tracepoints to netdev layer	2010-09-07 17:51:33 +02:00
netevent.c
netpoll.c	netpoll: Revert napi_poll fix for bonding driver	2010-10-20 01:44:30 -07:00
pktgen.c	net: core: use kernel's converter from hex to bin	2010-09-21 18:04:45 -07:00
request_sock.c
rtnetlink.c	rtnetlink: remove rtnl_kill_links	2010-10-21 03:09:45 -07:00
scm.c
skbuff.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
sock.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
stream.c	net: Fix the condition passed to sk_wait_event()	2010-10-03 20:41:32 -07:00
sysctl_net_core.c
timestamping.c
user_dma.c
utils.c	net: return operator cleanup	2010-09-23 14:33:39 -07:00