Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc
[cascardo/linux.git] / drivers / char / .gitignore
1 consolemap_deftbl.c
2 defkeymap.c