Skip to content
Commit f444fea7 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

drivers/ptp/Kconfig:
  55c8fca1 ("ptp_pch: Restore dependency on PCI")
  e5f31552

 ("ethernet: fix PTP_1588_CLOCK dependencies")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9e5f10fe f87d6431
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment