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
..
bestcomm	…
edac.h	…
guts.h	net/ethernet/freescale/fman: fix cross-build error	2018-07-16 14:02:45 -07:00
mc.h	…
ptp_qoriq.h	ptp: support DPAA FMan 1588 timer in ptp_qoriq	2018-06-26 22:15:14 +09:00