diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 06:23:57 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 06:23:57 -0400 |
| commit | 440fdb53b4ae58602711b5b8c3a139ace2404dbb (patch) | |
| tree | c6fb88d6ad537ec53aeecadc75a61ab6147d4c9c /Documentation/dontdiff | |
| parent | 8b2b403ce0f1a816b7a6a4f47c8798003b26c07a (diff) | |
| parent | 8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'Documentation/dontdiff')
| -rw-r--r-- | Documentation/dontdiff | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/dontdiff b/Documentation/dontdiff index 595a5ea4c690..7b9551fc6fe3 100644 --- a/Documentation/dontdiff +++ b/Documentation/dontdiff | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | *.moc | 18 | *.moc |
| 19 | *.mod.c | 19 | *.mod.c |
| 20 | *.o | 20 | *.o |
| 21 | *.o.* | ||
| 21 | *.orig | 22 | *.orig |
| 22 | *.out | 23 | *.out |
| 23 | 24 | ||
| @@ -163,6 +164,8 @@ raid6tables.c | |||
| 163 | relocs | 164 | relocs |
| 164 | series | 165 | series |
| 165 | setup | 166 | setup |
| 167 | setup.bin | ||
| 168 | setup.elf | ||
| 166 | sim710_d.h* | 169 | sim710_d.h* |
| 167 | sImage | 170 | sImage |
| 168 | sm_tbl* | 171 | sm_tbl* |