From: Peter Maydell Date: Fri, 13 Jun 2014 11:58:24 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20140613-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d61de7255b707f726447d3ed7459e18e0a4fab5b;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20140613-1' into staging audio: Drop superfluous conditionals around g_free() # gpg: Signature made Fri 13 Jun 2014 12:14:24 BST using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " * remotes/kraxel/tags/pull-audio-20140613-1: audio: Drop superfluous conditionals around g_free() Signed-off-by: Peter Maydell --- d61de7255b707f726447d3ed7459e18e0a4fab5b