Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
[pandora-kernel.git] / drivers / char / .gitignore
1 consolemap_deftbl.c
2 defkeymap.c