Merge branch 'linus' into x86/cpu

[linux-2.6-omap-h63xx.git] / Documentation / dontdiff

diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index feae2168634bcc8c534fd5e453f8a02b12f7da34..881e6dd03aea411bb9a1b0b11aa3b4fb3a90761e 100644 (file)
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -172,6 +172,7 @@ sm_tbl*
 split-include
 tags
 tftpboot.img
+timeconst.h
 times.h*
 tkparse
 trix_boot.h