Linus Torvalds 597d8c7178 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (56 commits) sky2: Fix oops in sky2_xmit_frame() after TX timeout Documentation/3c509: document ethtool support af_packet: Don't use skb after dev_queue_xmit() vxge: use pci_dma_mapping_error to test return value netfilter: ebtables: enforce CAP_NET_ADMIN e1000e: fix and commonize code for setting the receive address registers e1000e: e1000e_enable_tx_pkt_filtering() returns wrong value e1000e: perform 10/100 adaptive IFS only on parts that support it e1000e: don't accumulate PHY statistics on PHY read failure e1000e: call pci_save_state() after pci_restore_state() netxen: update version to 4.0.72 netxen: fix set mac addr netxen: fix smatch warning netxen: fix tx ring memory leak tcp: update the netstamp_needed counter when cloning sockets TI DaVinci EMAC: Handle emac module clock correctly. dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips ixgbe: Fix compiler warning about variable being used uninitialized netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq() mv643xx_eth: don't include cache padding in rx desc buffer size ... Fix trivial conflict in drivers/scsi/cxgb3i/cxgb3i_offload.c		2010-01-12 20:53:29 -08:00
..
datagram.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-06 00:55:55 -08:00
dev_mcast.c
dev.c	net: Fix userspace RTM_NEWLINK notifications.	2009-12-13 19:45:22 -08:00
drop_monitor.c	net: Replace old style lock initializer	2009-11-07 00:46:34 -08:00
dst.c
ethtool.c	ethtool: Add reset operation	2009-10-07 01:10:44 -07:00
fib_rules.c	net: Allow fib_rule_unregister to batch	2009-12-03 12:22:55 -08:00
filter.c	filter: Add SKF_AD_QUEUE instruction	2009-10-20 01:06:22 -07:00
flow.c
gen_estimator.c
gen_stats.c	pkt_sched: gen_estimator: Dont report fake rate estimators	2009-10-07 01:07:42 -07:00
iovec.c
kmap_skb.h
link_watch.c	linkwatch: linkwatch_forget_dev() to speedup device dismantle	2009-11-18 05:03:11 -08:00
Makefile	skbuff: remove skb_dma_map/unmap	2009-12-02 19:57:15 -08:00
neighbour.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
net_namespace.c	netns: Add an explicit rcu_barrier to unregister_pernet_{device|subsys}	2009-12-03 12:22:03 -08:00
net-sysfs.c	net: use net_eq to compare nets	2009-11-25 15:14:13 -08:00
net-sysfs.h
net-traces.c
netevent.c
netpoll.c
pktgen.c	pktgen: ndo_start_xmit can return NET_XMIT_xxx values	2009-12-23 22:02:57 -08:00
request_sock.c
rtnetlink.c	net: Fix userspace RTM_NEWLINK notifications.	2009-12-13 19:45:22 -08:00
scm.c
skbuff.c	const: constify remaining pipe_buf_operations	2009-12-16 07:20:05 -08:00
sock.c	tcp: update the netstamp_needed counter when cloning sockets	2010-01-08 00:00:09 -08:00
stream.c
sysctl_net_core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
user_dma.c
utils.c	printk: Remove ratelimit.h from kernel.h	2009-09-22 16:18:09 +02:00