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
..
block	[S390] dasd: PTR_ERR return of wrong pointer in	2009-12-18 17:43:31 +01:00
char	[S390] Use strim instead of strstrip to avoid false warnings.	2009-12-18 17:43:33 +01:00
cio	[S390] qdio: convert global statistics to per-device stats	2010-01-04 09:05:58 +01:00
crypto	[S390] zcrypt: remove BKL	2009-12-07 12:51:39 +01:00
kvm	[S390] kvm: use console_initcall() to initialize s390 virtio console	2009-09-11 10:29:52 +02:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-12 20:53:29 -08:00
scsi	[SCSI] zfcp: Remove flag ZFCP_STATUS_FSFREQ_TMFUNCNOTSUPP	2009-12-04 12:02:18 -06:00
Makefile	[S390] split/move machine check handler code	2009-03-26 15:24:10 +01:00