diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
| commit | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch) | |
| tree | a03891a32abe0da191fb765fe669a597e07423c6 /Documentation/dontdiff | |
| parent | 90bb28b0644f7324f8bd1feb27b35146e6785ba2 (diff) | |
| parent | 8ec53663d2698076468b3e1edc4e1b418bd54de3 (diff) | |
Merge branch 'ptebits' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'Documentation/dontdiff')
| -rw-r--r-- | Documentation/dontdiff | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/dontdiff b/Documentation/dontdiff index 881e6dd03aea..27809357da58 100644 --- a/Documentation/dontdiff +++ b/Documentation/dontdiff | |||
| @@ -5,6 +5,8 @@ | |||
| 5 | *.css | 5 | *.css |
| 6 | *.dvi | 6 | *.dvi |
| 7 | *.eps | 7 | *.eps |
| 8 | *.fw.gen.S | ||
| 9 | *.fw | ||
| 8 | *.gif | 10 | *.gif |
| 9 | *.grep | 11 | *.grep |
| 10 | *.grp | 12 | *.grp |