Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[linux-2.6] / drivers / char / .gitignore
1 consolemap_deftbl.c
2 defkeymap.c