Merge branch 'x86/x2apic' into x86/core
[linux-2.6] / drivers / char / .gitignore
1 consolemap_deftbl.c
2 defkeymap.c