diff --git a/[refs] b/[refs] index 899ead4e0182..c5c86859ad9f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5dafa224f295e9120c3a9f39e9f5d375583c0e2 +refs/heads/master: 0ecb3cdd4a73a0e51d40d57fe475640a28b55d68 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index baa17094f3a0..986b29a02bd0 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5556,7 +5556,7 @@ S: Maintained W: http://linuxptp.sourceforge.net/ F: Documentation/ABI/testing/sysfs-ptp F: Documentation/ptp/* -F: drivers/net/gianfar_ptp.c +F: drivers/net/ethernet/freescale/gianfar_ptp.c F: drivers/net/phy/dp83640* F: drivers/ptp/* F: include/linux/ptp_cl*