David S. Miller efd0bf97de
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.
The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.
Conflicts:
drivers/net/ethernet/nvidia/forcedeth.c
drivers/net/wireless/libertas/cfg.c
2011-11-21 13:50:33 -05:00
2011-04-21 16:59:30 -07:00
2010-08-04 10:26:03 +10:00
2009-12-12 13:08:14 +01:00
2011-11-17 16:26:07 +11:00
2011-11-17 16:26:07 +11:00
2009-01-08 15:51:55 +01:00
2009-08-20 10:29:26 +10:00
2011-10-28 14:58:53 +02:00
2011-07-12 13:16:58 +03:00
2011-05-04 15:22:59 +10:00
2008-08-04 12:02:00 +10:00
2008-08-04 12:02:00 +10:00
2011-06-20 11:21:48 +10:00
2008-12-21 14:21:15 +11:00
2009-12-11 21:24:44 -07:00
2011-09-20 09:19:35 +10:00
2011-09-20 09:19:35 +10:00
2008-11-06 09:22:37 +11:00
2011-06-27 08:30:26 -05:00
2011-07-21 14:10:00 +02:00
2011-07-26 16:49:47 -07:00
2011-06-27 08:30:19 -05:00
2011-06-29 17:47:48 +10:00
2011-07-12 13:16:59 +03:00
2011-05-04 15:19:26 +10:00
2011-09-20 16:09:50 +10:00
2011-11-08 14:51:46 +11:00
2010-10-14 00:54:38 -05:00
2008-08-04 12:02:00 +10:00
2011-06-27 08:30:19 -05:00
2011-11-17 16:26:07 +11:00
2011-09-20 09:19:40 +10:00
2011-07-12 13:16:55 +03:00
2011-07-01 13:10:21 +10:00
2011-07-01 16:20:04 +02:00
2011-02-17 14:16:30 -08:00
2011-07-26 16:49:47 -07:00
2011-08-05 14:47:55 +10:00
2010-08-14 22:26:51 +02:00
2011-08-05 14:47:56 +10:00
2011-08-11 13:50:37 -04:00
2008-08-04 12:02:00 +10:00
2011-05-22 08:47:53 -04:00
2011-07-12 13:16:54 +03:00
2011-07-12 13:16:56 +03:00
2011-09-25 19:52:30 +03:00
2011-11-17 16:30:25 +02:00
2011-07-12 13:16:54 +03:00
2011-07-12 13:16:39 +03:00
2010-09-02 14:07:32 +10:00
2011-09-25 19:52:30 +03:00
2011-09-25 19:52:27 +03:00
2011-11-17 16:30:25 +02:00
2011-07-26 16:49:47 -07:00
2011-05-19 14:30:41 +10:00
2011-11-08 14:51:59 +11:00
2011-11-06 19:44:47 -08:00
2011-06-10 14:55:36 +02:00
2009-12-09 17:09:14 +11:00
2010-05-05 09:11:10 -04:00
2011-09-20 09:19:40 +10:00
2011-09-20 09:19:40 +10:00
2011-09-20 09:19:40 +10:00
2011-06-27 14:13:09 -07:00
2008-08-04 12:02:00 +10:00
2010-08-06 20:49:18 -06:00
2010-08-06 20:49:18 -06:00
2011-09-20 09:19:42 +10:00
2008-08-20 16:34:57 +10:00
2011-09-20 16:10:03 +10:00
2011-09-20 16:10:03 +10:00
2011-09-20 09:19:40 +10:00
2011-09-20 09:19:40 +10:00
2011-03-31 11:26:23 -03:00
2011-07-26 17:12:10 -07:00
2011-07-26 17:12:10 -07:00
2010-10-26 16:52:08 -07:00
2011-06-29 17:48:16 +10:00
2011-07-12 13:16:31 +03:00
2011-07-21 12:38:32 -07:00
2011-06-22 21:44:55 -05:00
2011-07-26 16:49:47 -07:00
2009-04-07 15:18:58 +10:00
2009-06-15 13:26:21 +10:00
2008-08-04 12:02:00 +10:00
2011-06-29 17:48:22 +10:00
2011-09-20 09:19:40 +10:00
2011-04-18 13:08:21 +10:00
2009-09-02 16:20:41 +10:00
2009-03-24 13:47:34 +11:00
2011-03-21 11:18:14 +11:00
2011-09-27 18:08:04 +02:00
2011-11-17 16:26:07 +11:00
2011-08-05 14:47:55 +10:00
2011-09-20 09:19:46 +10:00
2011-04-20 17:01:19 +10:00
2011-11-16 14:47:54 +11:00
2011-07-01 13:00:21 +10:00
2011-09-20 15:53:24 +10:00
2011-07-21 14:10:00 +02:00
2011-11-09 16:01:02 -05:00
2011-09-20 15:53:23 +10:00
2008-08-04 12:02:00 +10:00
2011-10-31 19:30:42 -04:00
2008-08-04 12:02:00 +10:00
2011-11-17 16:26:07 +11:00
2011-10-31 17:30:44 -07:00
2011-07-26 16:49:43 -07:00
2011-05-26 13:38:57 +10:00
2011-09-20 15:53:22 +10:00
2008-08-04 12:02:00 +10:00
2011-11-06 17:12:03 -08:00
2008-08-04 12:02:00 +10:00
2011-10-31 17:30:44 -07:00
2011-11-08 14:51:46 +11:00
efd0bf97de