Merge branch 'linus' into x86/timers
[pandora-kernel.git] / drivers / char / .gitignore
1 consolemap_deftbl.c
2 defkeymap.c