Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
[linux-2.6] / drivers / pci / .gitignore
1 classlist.h
2 devlist.h
3 gen-devlist
4