Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux

[deliverable/linux.git] / drivers / char / .gitignore

diff --git a/drivers/char/.gitignore b/drivers/char/.gitignore
index 73dfdcebfbba64a725a99fbb637242e07c1c5071..83683a2d8e6a9822ef2ee2f2a567b7600dea241f 100644 (file)
--- a/drivers/char/.gitignore
+++ b/drivers/char/.gitignore
@@ -1,3 +1,2 @@
 consolemap_deftbl.c
 defkeymap.c
-qtronixmap.c