Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge
[safe/jmp/linux-2.6] / drivers / char / .gitignore
1 consolemap_deftbl.c
2 defkeymap.c