Merge master.kernel.org:/home/rmk/linux-2.6-arm
[linux-3.10.git] / drivers / char / .gitignore
1 consolemap_deftbl.c
2 defkeymap.c