David S. Miller 22f10923dd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/amd/xgbe/xgbe-desc.c
	drivers/net/ethernet/renesas/sh_eth.c

Overlapping changes in both conflict cases.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-12-10 15:48:20 -05:00
..
2014-11-12 13:56:41 -05:00
2014-12-09 13:41:24 -05:00
2014-12-09 21:51:06 -05:00
2014-10-07 13:22:11 -04:00
2014-10-07 13:22:11 -04:00
2014-12-09 16:29:03 -05:00
2014-12-09 16:29:03 -05:00