Merge tag 'asoc-fix-v4.14-rc6' into asoc-linus
[sfrench/cifs-2.6.git] / .gitattributes
1 *.c   diff=cpp
2 *.h   diff=cpp