diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 23:54:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 23:54:12 -0400 |
| commit | bbe5a96f678efcad83de8f900ab4ab963a99c805 (patch) | |
| tree | d1e03c52bc7d16c1ac9f41503b27da2f4b6b781d /Documentation | |
| parent | f205ce83a766c08965ec78342f138cdc00631fba (diff) | |
| parent | 0a375d75902c522ea36c6dc409296622f93db4a7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: Update defconfigs.
sparc: Kill PROM console driver.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/dontdiff | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/dontdiff b/Documentation/dontdiff index 88519daab6e9..e1efc400bed6 100644 --- a/Documentation/dontdiff +++ b/Documentation/dontdiff | |||
| @@ -152,7 +152,6 @@ piggy.gz | |||
| 152 | piggyback | 152 | piggyback |
| 153 | pnmtologo | 153 | pnmtologo |
| 154 | ppc_defs.h* | 154 | ppc_defs.h* |
| 155 | promcon_tbl.c | ||
| 156 | pss_boot.h | 155 | pss_boot.h |
| 157 | qconf | 156 | qconf |
| 158 | raid6altivec*.c | 157 | raid6altivec*.c |