Files
kernel-eswin-eic7700/include/linux
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-08-14 13:55:15 +05:30
2013-07-30 11:53:12 -04:00
2013-05-29 15:50:34 -04:00
2013-07-03 16:07:39 -07:00
2013-08-26 18:40:56 -04:00
2013-08-27 01:44:40 +02:00
2013-07-23 16:01:28 -07:00
2013-07-15 11:25:00 +09:30
2013-08-26 20:15:23 +09:00
2013-06-17 16:38:57 -07:00
2013-08-22 22:13:54 -07:00
2013-06-19 23:32:07 -04:00
2013-09-13 15:09:52 +02:00
2013-08-23 10:22:29 +02:00
2013-10-01 12:17:08 +02:00
2013-06-13 17:51:04 -07:00
2013-07-18 13:05:23 -07:00
2013-06-17 16:38:57 -07:00
2013-10-28 20:07:50 -04:00
2013-09-13 15:09:52 +02:00
2013-09-13 15:09:52 +02:00
2013-09-13 15:09:52 +02:00
2013-08-09 10:49:00 +02:00
2013-07-26 16:19:48 -07:00
2013-08-28 21:35:14 -07:00
2013-07-16 22:00:14 -07:00
2013-05-31 00:48:22 -07:00
2013-09-26 11:03:29 +02:00
2013-08-12 15:27:01 +00:00
2013-09-08 20:20:23 -04:00
2013-07-03 16:08:05 -07:00
2013-10-25 19:03:39 -04:00
2013-10-14 17:15:48 +02:00
2013-06-08 16:20:14 -04:00
2013-09-03 16:40:32 -04:00
2013-09-24 21:12:32 -05:00
2013-08-12 15:27:01 +00:00
2013-06-12 12:37:30 +01:00
2013-09-09 14:29:15 -07:00
2013-05-31 17:19:05 -07:00
2013-06-21 11:32:51 +02:00
2013-07-03 16:08:05 -07:00
2013-06-17 16:38:57 -07:00
2013-06-17 18:09:53 +09:00
2013-09-10 18:56:32 -04:00
2013-09-04 23:11:42 +03:00
2013-09-12 15:38:02 -07:00
2013-07-24 15:12:53 -07:00
2013-08-05 10:52:36 -06:00
2013-10-17 15:53:09 -04:00
2013-07-10 18:11:34 -07:00