aboutsummaryrefslogtreecommitdiff
path: root/Documentation/dontdiff
diff options
context:
space:
mode:
authorMark Brown <[email protected]>2017-01-24 16:24:18 +0000
committerMark Brown <[email protected]>2017-01-24 16:24:18 +0000
commitdbbc21bbf2c640dd148903e82f752c2f269fc58a (patch)
treee85f5b686774e2fbae6387f94bf44c4076c49046 /Documentation/dontdiff
parentf6fa11a35c548a516a41ce1669d0dbcdaabb267f (diff)
parent7ce7d89f48834cefece7804d38fc5d85382edf77 (diff)
Merge tag 'v4.10-rc1' into asoc-intel
Linux 4.10-rc1
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 5385cba941d2..a23edccd2059 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -139,7 +139,6 @@ hpet_example
hugepage-mmap
hugepage-shm
ihex2fw
-ikconfig.h*
inat-tables.c
initramfs_list
int16.c