summaryrefslogtreecommitdiffstats
path: root/Documentation/dontdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-01 18:06:36 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-01 18:06:36 +0200
commit99dbb1632f1165c2726056ebfce6edde0e5a0208 (patch)
tree2b2fc83db20b4c6d13842496899774b0dc2868e2 /Documentation/dontdiff
parentMerge tag 'regulator-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff)
parentdoc: fix old config name of kprobetrace (diff)
downloadlinux-99dbb1632f1165c2726056ebfce6edde0e5a0208.tar.xz
linux-99dbb1632f1165c2726056ebfce6edde0e5a0208.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull the trivial tree from Jiri Kosina: "Tiny usual fixes all over the place" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits) doc: fix old config name of kprobetrace fs/fs-writeback.c: cleanup riteback_sb_inodes kerneldoc btrfs: fix the commment for the action flags in delayed-ref.h btrfs: fix trivial typo for the comment of BTRFS_FREE_INO_OBJECTID vfs: fix kerneldoc for generic_fh_to_parent() treewide: fix comment/printk/variable typos ipr: fix small coding style issues doc: fix broken utf8 encoding nfs: comment fix platform/x86: fix asus_laptop.wled_type module parameter mfd: printk/comment fixes doc: getdelays.c: remember to close() socket on error in create_nl_socket() doc: aliasing-test: close fd on write error mmc: fix comment typos dma: fix comments spi: fix comment/printk typos in spi Coccinelle: fix typo in memdup_user.cocci tmiofb: missing NULL pointer checks tools: perf: Fix typo in tools/perf tools/testing: fix comment / output typos ...
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 39462cf35cd4..74c25c8d8884 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -162,7 +162,6 @@ mach-types.h
machtypes.h
map
map_hugetlb
-maui_boot.h
media
mconf
miboot*