summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorAnthony Liguori <anthony@codemonkey.ws>2013-09-30 17:13:32 -0500
committerAnthony Liguori <anthony@codemonkey.ws>2013-09-30 17:13:32 -0500
commitd7f0efcb229bc1c3e458c6968efe4a6644f24740 (patch)
treedc94c6d3d9631db433fbbcc91c25387a76402a69 /MAINTAINERS
parent1b365b2eb629d033b3650acc9f46fc132ef0981c (diff)
parent19b0dfc19c0d911c322a03899806c59bc2f593c9 (diff)
downloadqemu-d7f0efcb229bc1c3e458c6968efe4a6644f24740.tar.gz
qemu-d7f0efcb229bc1c3e458c6968efe4a6644f24740.tar.bz2
qemu-d7f0efcb229bc1c3e458c6968efe4a6644f24740.zip
Merge remote-tracking branch 'kraxel/audio.1' into staging
# By Bandan Das (3) and Gerd Hoffmann (1) # Via Gerd Hoffmann * kraxel/audio.1: audio: remove CONFIG_MIXEMU configure option hda-codec: make mixemu selectable at runtime hda-codec: refactor common definitions into a header file audio maintainers update Message-id: 1380011943-15083-1-git-send-email-kraxel@redhat.com
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0431d094b3..5c3c70c89b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -638,6 +638,7 @@ Subsystems
----------
Audio
M: Vassili Karpov (malc) <av1474@comtv.ru>
+M: Gerd Hoffmann <kraxel@redhat.com>
S: Maintained
F: audio/
F: hw/audio/