]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bddfae 73204cf)
Merge remote-tracking branch 'kraxel/audio.3' into staging
authorAnthony Liguori <aliguori@amazon.com>
Wed, 13 Nov 2013 19:46:23 +0000 (11:46 -0800)
committerAnthony Liguori <aliguori@amazon.com>
Wed, 13 Nov 2013 19:46:23 +0000 (11:46 -0800)
# 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>

Trivial merge
Qemu copy for testing