Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-testing

[pandora-kernel.git] / drivers / char / .gitignore

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