diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-16 23:05:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-16 23:05:41 -0400 |
| commit | c6c621b3a977b20d7ceffd3debcacbe3de7c0e87 (patch) | |
| tree | 04b52f33ef1e8e24a4d9fa2c37cf218f82ff968a /Documentation | |
| parent | af6ea9ca23504fe620412826a420dca9c43a8bf6 (diff) | |
| parent | b7523418f6af9093c462341c08c2233f44f7a28d (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/dontdiff | 2 |
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 | |||
| 41 | CREDITS | 41 | CREDITS |
| 42 | CVS | 42 | CVS |
| 43 | ChangeSet | 43 | ChangeSet |
| 44 | Image | ||
| 44 | Kerntypes | 45 | Kerntypes |
| 45 | MODS.txt | 46 | MODS.txt |
| 46 | Module.symvers | 47 | Module.symvers |
| @@ -103,6 +104,7 @@ logo_*.c | |||
| 103 | logo_*_clut224.c | 104 | logo_*_clut224.c |
| 104 | logo_*_mono.c | 105 | logo_*_mono.c |
| 105 | lxdialog | 106 | lxdialog |
| 107 | mach-types.h | ||
| 106 | make_times_h | 108 | make_times_h |
| 107 | map | 109 | map |
| 108 | maui_boot.h | 110 | maui_boot.h |