Merge branch 'fix/usx2y' into for-linus
[linux-2.6] / drivers / char / .gitignore
1 consolemap_deftbl.c
2 defkeymap.c