summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-17 20:54:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-17 20:54:12 -0700
commitbbe5a96f678efcad83de8f900ab4ab963a99c805 (patch)
treed1e03c52bc7d16c1ac9f41503b27da2f4b6b781d /Documentation
parentf205ce83a766c08965ec78342f138cdc00631fba (diff)
parent0a375d75902c522ea36c6dc409296622f93db4a7 (diff)
downloadlinux-stable-bbe5a96f678efcad83de8f900ab4ab963a99c805.tar.gz
linux-stable-bbe5a96f678efcad83de8f900ab4ab963a99c805.tar.bz2
linux-stable-bbe5a96f678efcad83de8f900ab4ab963a99c805.zip
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/dontdiff1
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
piggyback
pnmtologo
ppc_defs.h*
-promcon_tbl.c
pss_boot.h
qconf
raid6altivec*.c