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
..
Kconfig	net: sh_eth: fix driver dependencies	2014-09-02 13:23:25 -07:00
Makefile
sh_eth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-12-10 15:48:20 -05:00
sh_eth.h	sh_eth: Fix sleeping function called from invalid context	2014-11-29 21:16:54 -08:00