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