aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/dontdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-25 17:43:57 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-25 17:43:57 -0500
commit1954ee55605a75c91924b63c2584f4d53f11afc7 (patch)
tree09adc8376a2b1ba190202a8908285ef3373ae28f /Documentation/dontdiff
parenta85821fce2c100a6680511f9693b76f9717fbdee (diff)
parent7b76bfc86757ca5e7b0a62f50003752da77c115b (diff)
Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig
* 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig: kconfig: simplification of scripts/extract-ikconfig
Diffstat (limited to 'Documentation/dontdiff')
-rw-r--r--Documentation/dontdiff1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index 3ad6acead94..d9bcffd5943 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -69,7 +69,6 @@ av_permissions.h
69bbootsect 69bbootsect
70bin2c 70bin2c
71binkernel.spec 71binkernel.spec
72binoffset
73bootsect 72bootsect
74bounds.h 73bounds.h
75bsetup 74bsetup