aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/dontdiff1
-rw-r--r--arch/x86/boot/.gitignore1
2 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index 74c25c8d8884..b89a739a3276 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -181,7 +181,6 @@ modversions.h*
181nconf 181nconf
182ncscope.* 182ncscope.*
183offset.h 183offset.h
184offsets.h
185oui.c* 184oui.c*
186page-types 185page-types
187parse.c 186parse.c
diff --git a/arch/x86/boot/.gitignore b/arch/x86/boot/.gitignore
index 851fe936d242..e3cf9f682be5 100644
--- a/arch/x86/boot/.gitignore
+++ b/arch/x86/boot/.gitignore
@@ -2,7 +2,6 @@ bootsect
2bzImage 2bzImage
3cpustr.h 3cpustr.h
4mkcpustr 4mkcpustr
5offsets.h
6voffset.h 5voffset.h
7zoffset.h 6zoffset.h
8setup 7setup