Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
[sfrench/cifs-2.6.git] / .gitattributes
1 *.c   diff=cpp
2 *.h   diff=cpp