Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
[linux-2.6] / drivers / char / .gitignore
1 consolemap_deftbl.c
2 defkeymap.c