David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ... All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-20 21:17:12 -07:00
..
common	net: cavium: use module_pci_driver to simplify the code	2018-03-29 14:36:33 -04:00
liquidio	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
octeon	octeon_mgmt: Fix MIX registers configuration on MTU setup	2018-07-18 13:13:07 +09:00
thunder	xdp: don't make drivers report attachment mode	2018-07-13 20:26:35 +02:00
Kconfig	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
Makefile	net: add support for Cavium PTP coprocessor	2018-01-16 14:31:14 -05:00