Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[pandora-kernel.git] / drivers / char / .gitignore
1 consolemap_deftbl.c
2 defkeymap.c