David S. Miller 71a83a6db6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/rocker/rocker.c

The rocker commit was two overlapping changes, one to rename
the ->vport member to ->pport, and another making the bitmask
expression use '1ULL' instead of plain '1'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-03-03 21:16:48 -05:00
..
2015-01-27 11:07:35 +01:00
2015-01-27 11:07:35 +01:00
2015-01-27 11:09:13 +01:00
2015-01-27 11:09:13 +01:00
2015-02-24 10:51:06 +01:00
2014-11-04 13:18:21 +01:00
2014-04-09 14:49:43 +02:00
2009-07-10 15:01:49 -04:00
2014-07-21 12:14:04 +02:00
2014-04-29 17:59:27 +02:00
2014-04-09 14:49:43 +02:00
2014-11-04 13:18:21 +01:00
2014-11-28 15:01:51 +01:00
2015-02-04 14:57:45 -08:00
2015-01-23 15:51:38 +01:00
2015-01-16 13:27:56 +01:00
2013-12-18 10:33:06 +01:00
2012-06-24 11:33:18 +02:00
2012-03-13 14:54:16 -04:00