aboutsummaryrefslogtreecommitdiff
path: root/Documentation/dontdiff
diff options
context:
space:
mode:
authorSteve French <sfrench@hera.kernel.org>2005-07-19 14:36:00 -0700
committerSteve French <sfrench@hera.kernel.org>2005-07-19 14:36:00 -0700
commit076fb01e8238b7e5d68ba0d729c0ff7716d1d8ec (patch)
treeabcaefe016870427ed289748cb0b936575d60593 /Documentation/dontdiff
parent4c48b0d3d1c7ff9f13134b30e41c6e81a92027bf (diff)
parentf60f700876cd51de9de69f3a3c865d95e287a24d (diff)
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'Documentation/dontdiff')
-rw-r--r--Documentation/dontdiff2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index d4fda25db86..b974cf595d0 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -41,6 +41,7 @@ COPYING
CREDITS
CVS
ChangeSet
+Image
Kerntypes
MODS.txt
Module.symvers
@@ -103,6 +104,7 @@ logo_*.c
logo_*_clut224.c
logo_*_mono.c
lxdialog
+mach-types.h
make_times_h
map
maui_boot.h