diff options
author | Linus Torvalds | 2006-01-05 01:36:52 +0100 |
---|---|---|
committer | Linus Torvalds | 2006-01-05 01:36:52 +0100 |
commit | 25c862cc9ea9b312c25a9f577f91b973131f1261 (patch) | |
tree | 8e8f56531144370ced50fa98db2973f4e93e38b0 /drivers/char | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial (diff) | |
parent | Merge branch 'master' (diff) | |
download | kernel-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/.gitignore | 2 |
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 |