David S. Miller 53af53ae83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: include/linux/netdevice.h net/core/sock.c Trivial merge issues. Removal of "extern" for functions declaration in netdevice.h at the same time "const" was added to an argument. Two parallel line additions in net/core/sock.c Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-08 23:07:53 -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-08 23:07:53 -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