summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-03 13:09:43 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-03 13:09:43 -0700
commit194d0710e1a7fe92dcf860ddd31fded8c3103b7a (patch)
treeda03b56fa4dee221c53af5770492d391f0d09459 /Documentation
parenta68d2ebc1581a3aec57bd032651e013fa609f530 (diff)
parent9bbd03758945858c9303f3258b418b94c4ffd735 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/dontdiff1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index b974cf595d01..96bea278bbf6 100644
--- 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