Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts
[openwrt/staging/blogic.git] / .gitattributes
1 *.c diff=cpp
2 *.h diff=cpp
3 *.dtsi diff=dts
4 *.dts diff=dts