summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-16 20:05:41 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-16 20:05:41 -0700
commitc6c621b3a977b20d7ceffd3debcacbe3de7c0e87 (patch)
tree04b52f33ef1e8e24a4d9fa2c37cf218f82ff968a /Documentation
parentaf6ea9ca23504fe620412826a420dca9c43a8bf6 (diff)
parentb7523418f6af9093c462341c08c2233f44f7a28d (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/dontdiff2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index d4fda25db868..b974cf595d01 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