merge Linus head tree into my drm tree and fix up conflicts
[powerpc.git] / scripts / .gitignore
1 conmakehash
2 kallsyms
3 pnmtologo
4