Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[linux-drm-fsl-dcu.git] / drivers / char / .gitignore
1 consolemap_deftbl.c
2 defkeymap.c