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