Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
[powerpc.git] / scripts / .gitignore
1 conmakehash
2 kallsyms
3 pnmtologo
4