summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorLinus Torvalds2006-01-05 01:36:52 +0100
committerLinus Torvalds2006-01-05 01:36:52 +0100
commit25c862cc9ea9b312c25a9f577f91b973131f1261 (patch)
tree8e8f56531144370ced50fa98db2973f4e93e38b0 /drivers/char
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial (diff)
parentMerge branch 'master' (diff)
downloadkernel-qcow2-linux-25c862cc9ea9b312c25a9f577f91b973131f1261.tar.gz
kernel-qcow2-linux-25c862cc9ea9b312c25a9f577f91b973131f1261.tar.xz
kernel-qcow2-linux-25c862cc9ea9b312c25a9f577f91b973131f1261.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/.gitignore b/drivers/char/.gitignore
index 2b6b1d772ed7..73dfdcebfbba 100644
--- a/drivers/char/.gitignore
+++ b/drivers/char/.gitignore
@@ -1,3 +1,3 @@
consolemap_deftbl.c
defkeymap.c
-
+qtronixmap.c