Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...
[linux-2.6-block.git] / .gitattributes
1 *.c   diff=cpp
2 *.h   diff=cpp