Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / Documentation / dontdiff

diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index b974cf595d0185627d53cf65d84e41d1585e5ac5..96bea278bbf61eb9ae6d6cb5657f8092b543a87e 100644 (file)
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -104,6 +104,7 @@ logo_*.c
 logo_*_clut224.c
 logo_*_mono.c
 lxdialog
+mach-types
 mach-types.h
 make_times_h
 map