From: Anthony Liguori <aliguori@amazon.com>
Date: Wed, 13 Nov 2013 19:46:23 +0000 (-0800)
Subject: Merge remote-tracking branch 'kraxel/audio.3' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9f43a3f541019a5836247c8cfdfc5fef89cf077d;p=qemu.git

Merge remote-tracking branch 'kraxel/audio.3' into staging

# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/audio.3:
  ossaudio: check for oss support in oss_audio_init
  Revert "ossaudio: do not enable by default"

Message-id: 1383823947-5132-1-git-send-email-kraxel@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
---

9f43a3f541019a5836247c8cfdfc5fef89cf077d