Merge branch 'linus' into oprofile-v2
[linux-2.6] / drivers / video / console / .gitignore
1 # conmakehash generated file
2 promcon_tbl.c