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
..
2014-04-09 10:55:27 +02:00
2013-10-11 15:38:20 +02:00
2013-12-18 10:33:06 +01:00
2013-12-18 10:33:06 +01:00
2014-09-03 13:40:38 +02:00
2014-10-22 10:42:09 +02:00
2014-11-04 13:18:21 +01:00
2014-02-04 21:48:21 +01:00
2014-11-04 13:18:21 +01:00
2014-11-04 13:18:21 +01:00
2014-10-21 21:08:10 +02:00
2014-09-11 13:37:02 +02:00
2014-04-09 14:49:43 +02:00
2014-09-15 14:51:23 -04:00
2014-09-11 13:37:02 +02:00
2014-04-09 14:49:43 +02:00
2014-11-04 13:49:00 +01:00
2014-06-23 11:05:33 +02:00
2014-07-21 12:14:04 +02:00
2014-10-29 16:37:45 +01:00
2014-11-14 01:01:12 -05:00
2014-11-14 01:01:12 -05:00
2014-11-04 13:18:21 +01:00
2014-10-22 11:30:30 +02:00
2013-12-16 11:29:48 +01:00
2013-08-01 10:48:49 +02:00
2013-08-01 10:48:49 +02:00
2014-10-27 08:48:34 +01:00
2014-11-04 13:18:21 +01:00
2014-07-15 16:27:00 -07:00
2014-10-09 11:19:07 +02:00
2014-09-08 11:14:56 -04:00
2014-03-05 15:49:54 +01:00
2014-04-29 17:59:27 +02:00
2014-10-29 16:37:45 +01:00
2014-10-09 11:19:07 +02:00
2014-04-09 14:49:43 +02:00
2014-11-14 01:01:12 -05:00
2014-11-04 13:18:21 +01:00
2014-06-23 14:22:25 +02:00
2014-06-23 14:22:25 +02:00
2014-10-14 11:16:16 +02:00
2014-06-23 11:05:23 +02:00
2014-10-20 16:37:01 +02:00
2014-10-23 20:36:13 +02:00
2014-10-27 08:48:35 +01:00
2014-10-21 13:25:26 +02:00
2014-10-31 08:29:56 +01:00
2014-09-11 12:08:31 +02:00
2014-11-14 01:01:12 -05:00
2014-09-05 13:52:06 +02:00
2014-10-29 16:37:45 +01:00
2014-11-04 13:18:22 +01:00
2014-10-09 10:33:29 +02:00
2014-10-22 10:42:09 +02:00
2014-10-23 20:40:02 +02:00
2013-12-18 10:33:06 +01:00
2012-06-24 11:33:18 +02:00
2014-11-04 13:49:00 +01:00
2014-11-04 13:18:21 +01:00
2014-11-04 13:49:00 +01:00
2014-07-21 12:14:04 +02:00
2014-10-23 20:40:01 +02:00
2012-03-13 14:54:16 -04:00
2014-11-04 13:18:21 +01:00
2014-10-22 10:42:09 +02:00
2014-10-23 20:40:01 +02:00
2013-11-25 20:50:52 +01:00