Merge tag 'batadv-net-for-davem-20160708' of git://git.open-mesh.org/linux-merge

[deliverable/linux.git] / Documentation / dontdiff

diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index 9de9813d0ec5df101a48428d40cfc9b9d2df6142..8ea834f6b2892a6ed7cccbc399cc5f1f3e887bd0 100644 (file)
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -165,7 +165,6 @@ mach-types.h
 machtypes.h
 map
 map_hugetlb
-media
 mconf
 miboot*
 mk_elfconfig