David S. Miller 076ce44825 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/chelsio/cxgb4vf/sge.c
	drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

sge.c was overlapping two changes, one to use the new
__dev_alloc_page() in net-next, and one to use s->fl_pg_order in net.

ixgbe_phy.c was a set of overlapping whitespace changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-11-14 01:01:12 -05:00
..
2013-12-18 10:33:06 +01:00
2013-12-18 10:33:06 +01:00
2014-11-04 13:18:21 +01:00
2014-11-04 13:18:21 +01:00
2014-11-04 13:18:21 +01:00
2014-04-09 14:49:43 +02:00
2014-07-21 12:14:04 +02:00
2014-11-04 13:18:21 +01:00
2013-12-16 11:29:48 +01:00
2014-11-04 13:18:21 +01: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-06-23 11:05:23 +02:00
2013-12-18 10:33:06 +01:00
2012-06-24 11:33:18 +02:00
2014-11-04 13:18:21 +01:00
2014-07-21 12:14:04 +02:00
2012-03-13 14:54:16 -04:00
2014-11-04 13:18:21 +01:00