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
..
2010-01-07 01:07:30 -08:00
2010-01-03 21:42:49 -08:00
2009-10-13 11:48:18 -07:00
2010-01-03 21:42:50 -08:00
2010-01-08 00:35:28 -08:00
2010-01-07 00:43:47 -08:00
2009-12-11 11:55:21 -08:00
2009-12-15 08:53:25 -08:00
2009-09-01 01:13:50 -07:00
2008-11-25 18:25:32 -08:00
2009-04-04 16:51:14 -07:00
2009-08-12 23:03:00 -07:00
2009-08-12 22:53:28 -07:00
2009-11-05 20:00:41 -08:00
2009-11-05 20:00:29 -08:00
2009-11-06 20:26:09 -08:00
2008-09-22 19:27:10 -07:00
2009-10-11 23:30:16 -07:00
2009-10-11 23:30:16 -07:00
2009-12-15 08:53:25 -08:00
2009-11-11 19:22:21 -08:00
2009-09-23 07:39:43 -07:00
2009-10-11 11:20:58 -07:00
2008-11-25 18:23:59 -08:00
2009-10-20 18:51:37 -07:00
2008-11-25 18:24:57 -08:00
2009-04-16 02:20:08 -07:00
2009-09-07 01:56:52 -07:00
2009-01-06 10:47:44 -08:00
2009-11-20 15:35:04 -08:00
2009-07-06 13:05:13 -07:00
2009-10-13 11:48:18 -07:00
2009-10-20 19:11:06 -07:00
2008-11-25 18:24:38 -08:00
2009-04-16 02:20:16 -07:00
2009-04-16 02:20:21 -07:00
2010-01-03 21:42:52 -08:00
2009-12-15 08:53:25 -08:00
2010-01-03 22:06:15 -08:00
2009-04-29 17:32:34 -07:00
2009-12-07 18:36:35 +01:00
2009-10-13 11:48:18 -07:00
2009-10-13 11:48:18 -07:00
2009-10-01 15:14:54 -07:00
2009-10-29 22:57:27 -07:00
2009-12-11 16:16:33 -08:00
2009-03-27 00:46:48 -07:00
2008-11-25 18:25:49 -08:00
2008-08-29 02:13:33 -07:00
2008-08-29 02:14:29 -07:00
2008-08-29 02:14:43 -07:00
2009-12-03 13:18:08 -08:00
2009-12-03 13:18:04 -08:00
2008-05-30 22:18:02 -04:00
2009-12-26 20:24:44 -08:00
2009-11-26 15:51:29 -08:00
2009-01-11 00:06:36 -08:00