Linus Torvalds 06f4e926d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)
  macvlan: fix panic if lowerdev in a bond
  tg3: Add braces around 5906 workaround.
  tg3: Fix NETIF_F_LOOPBACK error
  macvlan: remove one synchronize_rcu() call
  networking: NET_CLS_ROUTE4 depends on INET
  irda: Fix error propagation in ircomm_lmp_connect_response()
  irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
  irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
  be2net: Kill set but unused variable 'req' in lancer_fw_download()
  irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
  atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
  rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
  pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
  isdn: capi: Use pr_debug() instead of ifdefs.
  tg3: Update version to 3.119
  tg3: Apply rx_discards fix to 5719/5720
  ...

Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.
2011-05-20 13:43:21 -07:00
..
2008-10-22 22:55:23 -07:00
2011-05-02 14:18:52 +02:00
2011-05-02 14:18:52 +02:00
2009-01-29 14:16:51 +01:00
2008-10-22 22:55:23 -07:00
2011-01-13 08:03:25 -08:00
2011-02-23 22:27:52 +01:00
2009-12-05 09:10:12 -08:00
2008-10-22 22:55:23 -07:00
2011-03-18 10:39:30 +01:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:20 -07:00
2008-10-22 22:55:20 -07:00
2011-02-14 12:08:28 +01:00
2008-10-22 22:55:20 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2011-05-02 17:24:48 +02:00
2008-10-22 22:55:23 -07:00
2011-05-09 12:14:29 -07:00
2008-10-22 22:55:20 -07:00
2010-02-16 21:22:26 -08:00
2008-10-22 22:55:20 -07:00
2008-10-22 22:55:23 -07:00
2011-02-28 18:06:22 +01:00
2011-05-16 14:55:57 -04:00
2011-04-18 09:26:48 -07:00
2010-10-26 16:52:08 -07:00
2008-10-22 22:55:23 -07:00
2010-05-07 17:13:04 -07:00
2011-01-07 10:03:50 -05:00
2008-10-22 22:55:23 -07:00
2009-03-27 14:43:57 -04:00
2008-12-12 11:58:36 +01:00
2009-08-27 00:35:56 +02:00
2011-02-24 14:52:18 +01:00
2010-03-10 13:23:34 +01:00
2008-10-22 22:55:20 -07:00
2010-10-26 16:52:08 -07:00
2009-01-21 17:26:06 +09:00
2011-03-03 12:47:08 +01:00
2011-02-23 22:27:52 +01:00
2010-10-07 14:08:55 +01:00
2008-10-22 22:55:23 -07:00
2010-08-14 22:26:51 +02:00
2009-06-13 15:37:30 +02:00
2011-03-17 13:08:35 -03:00
2008-10-22 22:55:23 -07:00
2010-06-09 11:12:36 +02:00
2010-01-05 15:34:49 +09:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:20 -07:00
2010-05-07 17:13:04 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:20 -07:00
2011-03-18 10:39:30 +01:00
2011-03-18 10:39:30 +01:00
2010-06-29 12:12:59 +02:00
2011-01-13 17:32:39 -08:00
2011-01-26 10:49:57 +10:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2010-11-18 12:52:04 +01:00
2011-03-18 10:39:30 +01:00
2010-11-01 15:38:34 -04:00
2010-10-26 16:52:08 -07:00
2011-01-13 17:32:44 -08:00
2011-01-13 17:32:44 -08:00
2008-10-22 22:55:20 -07:00
2008-10-22 22:55:20 -07:00
2009-02-02 23:27:09 +05:30
2011-03-15 15:34:15 -07:00
2011-02-25 16:18:52 +01:00
2010-02-12 09:42:39 -08:00
2011-03-18 10:39:30 +01:00
2011-03-18 10:39:30 +01:00
2008-10-22 22:55:20 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:20 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:20 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2009-06-15 12:40:02 +02:00
2008-10-22 22:55:20 -07:00
2008-10-22 22:55:20 -07:00
2009-01-31 00:19:32 +05:30
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2011-01-12 11:23:16 +02:00
2011-03-18 10:39:30 +01:00
2011-03-23 19:47:18 -07:00
2011-05-20 12:50:29 -07:00
2011-05-20 12:50:29 -07:00
2011-05-20 12:50:29 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:20 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2009-08-21 21:43:46 +02:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:20 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2009-06-15 12:40:02 +02:00