git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7316 35acf78f-673a-0410-8e92-d51de3d6d3f4
Merge remote-tracking branch 'upstream/master'