Merge remote-tracking branches 'asoc/fix/da7219-pops' and 'asoc/fix/qcom' into asoc...
[jlayton/linux.git] / .gitattributes
1 *.c   diff=cpp
2 *.h   diff=cpp