aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/compat-timer.h (renamed from nptl/sysdeps/unix/sysv/linux/x86_64/compat-timer.h)0
2 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b48373286..515cdc1197 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2014-05-14 Roland McGrath <roland@hack.frob.com>
+ * nptl/sysdeps/unix/sysv/linux/x86_64/compat-timer.h: Moved ...
+ * sysdeps/unix/sysv/linux/x86_64/compat-timer.h: ... here.
* nptl/sysdeps/unix/sysv/linux/x86_64/Versions: Remove, merge into ...
* sysdeps/unix/sysv/linux/x86_64/Versions: ... here.
* nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c: Moved ...
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/compat-timer.h b/sysdeps/unix/sysv/linux/x86_64/compat-timer.h
index 2cb19bc173..2cb19bc173 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/compat-timer.h
+++ b/sysdeps/unix/sysv/linux/x86_64/compat-timer.h