David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/qmi_wwan.c include/net/dst.h Trivial merge conflicts, both were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-23 16:49:34 -04:00
..
Kconfig	sh_eth: Add support for r8a7790 SoC	2013-07-24 15:39:26 -07:00
Makefile
sh_eth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-23 16:49:34 -04:00
sh_eth.h	sh_eth: remove 'register_type' field from 'struct sh_eth_plat_data'	2013-08-20 17:10:41 -07:00