Merge branches 'tracing/ftrace' and 'linus' into tracing/core
[linux-2.6] / drivers / char / .gitignore
1 consolemap_deftbl.c
2 defkeymap.c