David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/intel/i40e/i40e_main.c
	drivers/net/macvtap.c

Both minor merge hassles, simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-18 16:42:06 -05:00
..
2013-11-27 01:03:27 +01:00
2013-12-06 08:30:18 -08:00
2013-10-29 12:53:07 +02:00
2013-12-08 18:47:25 -08:00
2013-11-07 19:24:20 +01:00
2013-12-12 11:05:19 -08:00
2013-12-02 21:11:30 +00:00
2013-12-13 13:22:22 -08:00
2013-12-08 18:47:25 -08:00
2013-12-11 10:56:21 -05:00
2013-11-15 14:05:15 -08:00
2013-12-10 13:12:28 +01:00
2013-11-18 15:35:09 -08:00
2013-12-06 08:30:18 -08:00
2013-11-29 12:53:19 -08:00
2013-12-06 15:22:05 -05:00
2013-12-10 08:48:15 +01:00
2013-12-02 10:12:01 -08:00