Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
[pandora-kernel.git] / usr / .gitignore
1 #
2 # Generated files
3 #
4 gen_init_cpio
5 initramfs_data.cpio
6 initramfs_data.cpio.gz
7 initramfs_list