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-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-12-09 00:50:13 -08:00
2008-08-31 20:59:37 -07:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2010-07-24 09:57:52 -06:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2009-12-16 07:20:12 -08:00
2010-01-29 08:22:01 -08:00
2008-07-27 23:00:59 +02:00
2008-08-31 20:56:15 -07:00
2008-07-27 23:00:59 +02:00
2008-08-24 20:33:56 -07:00
2008-07-27 23:00:59 +02:00
2010-10-26 16:52:08 -07:00
2011-03-31 11:26:23 -03:00
2008-07-27 23:00:59 +02:00
2008-08-29 02:15:23 -07:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2009-01-04 15:44:52 -08:00
2011-03-18 15:03:16 -07:00
2011-03-18 15:03:16 -07:00
2008-07-27 23:00:59 +02:00
2010-10-07 14:08:55 +01:00
2010-10-07 14:08:55 +01:00
2010-10-08 13:04:00 -06:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2010-06-09 11:12:36 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-12-26 15:35:41 -08:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2011-03-31 11:26:23 -03:00
2010-12-12 14:57:53 -08:00
2008-07-27 23:00:59 +02:00
2010-01-14 03:14:53 -08:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2010-10-27 18:03:17 -07:00
2008-07-27 23:00:59 +02:00
2011-03-31 11:26:23 -03:00
2010-10-26 16:52:08 -07:00
2010-10-26 16:52:08 -07:00
2008-07-27 23:00:59 +02:00
2009-01-02 18:35:29 -08:00
2008-07-27 23:00:59 +02:00
2011-03-31 11:26:23 -03:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-12-27 00:35:12 -08:00
2008-07-27 23:00:59 +02:00
2009-01-02 19:34:46 -08:00
2009-01-02 21:10:04 -08:00
2008-07-27 23:00:59 +02:00
2008-12-07 00:04:30 -08:00
2008-09-06 19:30:17 +01:00
2009-01-06 18:10:27 -08:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-09-19 21:18:03 -07:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2009-01-02 21:33:05 -08:00
2011-03-23 19:47:18 -07:00
2010-08-09 00:45:46 -07:00
2010-08-09 00:45:46 -07:00
2008-07-27 23:00:59 +02:00
2011-05-05 11:10:14 -07:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00
2008-08-31 20:59:37 -07:00
2008-07-27 23:00:59 +02:00
2008-07-27 23:00:59 +02:00