Merge branch 'btrfs-3.0' into for-linus

[pandora-kernel.git] / Documentation / DocBook / .gitignore

diff --git a/Documentation/DocBook/.gitignore b/Documentation/DocBook/.gitignore
index 2c8c882..720f245 100644 (file)
--- a/Documentation/DocBook/.gitignore
+++ b/Documentation/DocBook/.gitignore
@@ -8,13 +8,7 @@
 *.dvi
 *.log
 *.out
-crop.gif
-dvbstb.png
-fieldseq_bt.gif
-fieldseq_tb.gif
+*.png
+*.gif
 media-indices.tmpl
-nv12mt.gif
-nv12mt_example.gif
-vbi_525.gif
-vbi_625.gif
-vbi_hsync.gif
+media-entities.tmpl