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