Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / drivers / char / .gitignore

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