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
..
Kconfig	ptp: support DPAA FMan 1588 timer in ptp_qoriq	2018-06-26 22:15:14 +09:00
Makefile	ptp: rework gianfar_ptp as QorIQ common PTP driver	2018-05-28 23:05:11 -04:00
ptp_chardev.c	ptp: fix missing break in switch	2018-07-18 15:25:25 -07:00
ptp_clock.c
ptp_dte.c
ptp_ixp46x.c
ptp_kvm.c
ptp_pch.c
ptp_private.h
ptp_qoriq.c	ptp: support DPAA FMan 1588 timer in ptp_qoriq	2018-06-26 22:15:14 +09:00
ptp_sysfs.c