Merge tag 'v4.9-rc1' into x86/fpu, to resolve conflict
[muen/linux.git] / .gitattributes
1 *.c   diff=cpp
2 *.h   diff=cpp