David S. Miller 60747ef4d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor overlapping changes for both merge conflicts. Resolution work done by Stephen Rothwell was used as a reference. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-08-18 01:17:32 -04:00
..
Kconfig
Makefile
mtk_eth_soc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-08-18 01:17:32 -04:00
mtk_eth_soc.h	net-next: mediatek: add support for IRQ grouping	2016-06-30 08:52:04 -04:00