Merge remote-tracking branch 'qemu/master'
commit1eeadf26c9379f2600e138c3b6e34b54c52d8911
authorStefan Weil <sw@weilnetz.de>
Thu, 31 Mar 2016 19:07:53 +0000 (31 21:07 +0200)
committerStefan Weil <sw@weilnetz.de>
Thu, 31 Mar 2016 19:07:53 +0000 (31 21:07 +0200)
treece51da9e185a5d5817f598def413fdffbb292cc5
parentce528ab045e2d9075a3068d8056983eee45e4c22
parent57528a3fef2fd65661320723ad8c3c781f4fd49f
Merge remote-tracking branch 'qemu/master'
MAINTAINERS
docs/tracing.txt