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-07-19 13:54:23 -07:00
2013-09-10 13:03:41 -07:00
2013-03-13 15:21:48 -07:00
2013-07-09 10:33:30 -07:00
2011-10-29 21:20:22 +02:00
2013-02-27 19:10:09 -08:00
2012-10-06 03:04:57 +09:00
2012-10-09 16:22:40 +09:00
2013-06-18 13:48:45 +02:00
2012-12-17 17:15:22 -08:00
2012-07-30 17:25:16 -07:00
2012-01-31 23:19:47 +02:00
2013-09-09 14:29:15 -07:00
2011-12-08 19:52:43 -05:00
2013-04-29 18:28:42 -07:00