Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
[linux-2.6] / drivers / char / .gitignore
1 consolemap_deftbl.c
2 defkeymap.c