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
..
acpi	ACPI: processor: remove _PDC object list from struct acpi_processor	2009-12-22 03:35:16 -05:00
asm-generic	fix up O_SYNC comments	2009-12-17 11:03:24 -05:00
crypto
drm	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2010-01-11 09:46:20 -08:00
keys
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-12 20:53:29 -08:00
math-emu
media
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-12 20:53:29 -08:00
pcmcia
rdma
rxrpc
scsi	libsrp: fix compile failure	2009-12-30 12:23:27 -08:00
sound
trace	tracing: Fix sign fields in ftrace_define_fields_##call()	2009-12-30 10:27:06 -05:00
video
xen
Kbuild