David S. Miller c99f7abf0e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: include/net/inetpeer.h net/ipv6/output_core.c Changes in net were fixing bugs in code removed in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-06-03 23:32:12 -07:00
..
Kconfig	sh_eth: add R8A7791 support	2013-12-10 21:47:35 -05:00
Makefile
sh_eth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
sh_eth.h	sh_eth: use RNC mode for packet reception	2014-06-03 19:28:42 -07:00