Merge tag 'v3.7-rc3' into for-linus to sync up with recent USB changes
[pandora-kernel.git] / sound / oss / .gitignore
1 #Ignore generated files
2 pss_boot.h
3 trix_boot.h