David S. Miller
394efd19d5
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Conflicts:
drivers/net/ethernet/emulex/benet/be.h
drivers/net/netconsole.c
net/bridge/br_private.h
Three mostly trivial conflicts.
The net/bridge/br_private.h conflict was a function signature (argument
addition) change overlapping with the extern removals from Joe Perches.
In drivers/net/netconsole.c we had one change adjusting a printk message
whilst another changed "printk(KERN_INFO" into "pr_info(".
Lastly, the emulex change was a new inline function addition overlapping
with Joe Perches's extern removals.
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-11-04 13:48:30 -05:00
2013-10-23 16:49:34 -04:00
2013-07-03 16:08:06 -07:00
2013-10-11 13:22:43 +02:00
2013-09-11 15:59:28 -07:00
2013-09-06 09:36:28 -07:00
2013-09-20 09:56:06 +01:00
2013-04-29 18:28:19 -07:00
2013-09-30 14:31:02 -07:00
2013-02-27 19:10:22 -08:00
2013-09-12 15:38:02 -07:00
2013-10-02 16:03:51 -04:00
2013-05-21 10:21:57 -07:00
2013-08-10 03:24:47 +02:00
2013-04-23 13:45:22 +02:00
2013-07-03 16:07:42 -07:00
2013-07-25 12:37:24 +02:00
2013-09-05 20:46:06 -04:00
2013-10-23 16:49:34 -04:00
2013-09-09 10:33:19 -07:00
2013-09-10 13:37:36 -07:00
2013-08-20 12:47:28 +02:00
2013-04-12 14:06:16 +10:00
2013-08-20 12:41:11 +02:00
2013-09-18 19:22:22 -05:00
2013-08-27 10:50:52 +02:00
2013-07-31 10:33:05 +02:00
2013-09-07 10:54:19 -07:00
2013-09-06 09:36:28 -07:00
2013-04-02 09:39:55 -07:00
2013-09-04 10:49:57 +02:00
2013-06-26 21:10:13 +02:00
2013-07-24 22:06:34 -07:00
2013-09-05 11:10:08 +02:00
2013-07-04 11:40:58 -07:00
2013-08-12 17:43:13 -07:00
2013-07-15 13:57:00 +02:00
2013-08-26 17:22:13 -07:00
2013-05-17 15:17:12 +02:00
2013-05-28 12:02:12 +02:00
2013-05-28 12:02:12 +02:00
2013-03-22 12:10:42 -04:00
2013-08-27 10:50:52 +02:00
2013-11-04 13:48:30 -05:00
2013-07-09 22:09:19 +02:00
2013-08-27 10:54:52 +02:00
2013-08-27 14:44:27 +10:00
2013-09-23 16:46:17 -04:00
2013-07-25 12:34:15 +02:00
2013-08-31 14:44:45 -07:00
2013-05-02 15:50:20 +02:00
2013-09-12 19:14:17 +02:00
2013-09-15 17:41:30 -04:00
2013-03-19 14:16:42 -07:00
2013-06-03 14:31:39 -07:00
2013-10-11 10:23:49 +02:00
2013-08-20 12:52:28 +02:00
2013-09-11 15:59:01 -07:00
2013-08-20 12:56:26 +02:00
2013-09-03 09:10:24 -04:00
2013-08-18 18:06:55 -07:00
2013-08-09 10:57:06 -04:00
2013-08-27 10:57:11 +02:00
2013-08-12 12:24:27 -07:00
2013-08-18 07:12:59 -03:00
2013-09-06 09:36:28 -07:00
2013-09-11 15:57:56 -07:00
2013-07-04 11:40:58 -07:00
2013-07-11 21:47:58 +02:00
2013-09-06 09:36:28 -07:00
2013-05-09 01:07:09 -07:00
2013-08-20 12:41:25 +02:00
2013-08-27 10:53:07 +02:00
2013-07-04 11:40:58 -07:00
2013-08-20 12:46:52 +02:00
2013-08-19 12:27:17 -07:00
2013-07-03 22:58:20 +02:00
2013-07-03 16:08:01 -07:00
2013-07-14 19:36:59 -04:00
2013-09-04 12:59:47 +02:00
2013-07-03 16:08:03 -07:00
2013-02-27 19:10:23 -08:00
2013-09-10 11:36:45 +05:30
2013-08-22 22:57:32 -07:00
2013-05-28 12:02:12 +02:00
2013-04-16 18:47:19 +09:00
2013-06-03 14:22:57 -07:00
2013-03-10 18:16:36 +08:00
2013-08-27 10:46:02 +02:00
2013-04-29 15:18:50 +02:00
2013-02-27 19:10:21 -08:00
2013-08-20 12:59:18 +02:00
2013-05-28 12:02:11 +02:00
2013-09-30 14:31:02 -07:00
2013-07-04 11:40:58 -07:00
2013-08-27 10:47:05 +02:00
2013-02-19 08:42:37 +01:00
2013-01-31 19:20:33 -05:00
2013-07-03 09:43:28 +10:00
2013-07-13 12:09:57 -07:00
2013-08-19 21:39:42 -07:00
2013-09-06 09:36:28 -07:00
2013-08-23 08:56:28 +02:00
2013-09-06 09:36:28 -07:00
2013-06-21 11:32:51 +02:00
2013-06-19 12:58:42 +02:00
2013-07-03 16:07:54 -07:00
2013-06-19 12:58:42 +02:00
2013-06-03 14:20:18 -07:00
2013-08-20 12:58:15 +02:00
2013-07-25 12:34:15 +02:00
2013-04-30 17:04:10 -07:00
2013-04-04 10:24:53 -07:00
2013-09-05 16:36:21 -06:00
2013-08-21 10:32:09 -04:00
2013-06-26 12:10:56 +02:00
394efd19d5
