summaryrefslogtreecommitdiffstats
path: root/Documentation/dontdiff
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2005-08-17 22:56:07 -0700
committerDave Jones <davej@redhat.com>2005-08-17 22:56:07 -0700
commita8b3e6f10f08f66ae1072efd087b30966a3654f6 (patch)
tree1d1409855f8ad5beabafe061c6453edd84ba94c8 /Documentation/dontdiff
parent46acac3b4fd8ef66eec63b51de8d556a17c7d4f7 (diff)
parent099d44e869f1886b5eb02a5145ca97b5e4142e28 (diff)
downloadtalos-op-linux-a8b3e6f10f08f66ae1072efd087b30966a3654f6.tar.gz
talos-op-linux-a8b3e6f10f08f66ae1072efd087b30966a3654f6.zip
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'Documentation/dontdiff')
-rw-r--r--Documentation/dontdiff4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index 9a33bb94f74f..96bea278bbf6 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -41,6 +41,7 @@ COPYING
CREDITS
CVS
ChangeSet
+Image
Kerntypes
MODS.txt
Module.symvers
@@ -103,6 +104,8 @@ logo_*.c
logo_*_clut224.c
logo_*_mono.c
lxdialog
+mach-types
+mach-types.h
make_times_h
map
maui_boot.h
@@ -111,6 +114,7 @@ mkdep
mktables
modpost
modversions.h*
+offset.h
offsets.h
oui.c*
parse.c*
OpenPOWER on IntegriCloud