]> git.proxmox.com Git - qemu.git/commit
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit9f43a3f541019a5836247c8cfdfc5fef89cf077d
tree9c1fe8814f8acbc13a7463645092abf4b9bb1916tree
parent6bddfae306001c6e474ff97ef59c518568ea5af4commit | diff
parent73204cffe55ce65b3a344afc3da637d67beb8c32commit | diff
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>
Qemu copy for testing