Merge branch 'tracing/core-v2' into tracing-for-linus
[linux-2.6] / drivers / char / .gitignore
1 consolemap_deftbl.c
2 defkeymap.c