Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

[qemu.git] / .gitattributes

*.c.inc         diff=c
*.h.inc         diff=c
*.py            diff=python