summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-02-01 07:22:47 +0100
committerTakashi Iwai <tiwai@suse.de>2013-02-01 07:22:47 +0100
commit8058e14259ddc8c1824387198fc53700ed4cccc9 (patch)
treefaffb83ca5173e5f3cbfd4170de603ada4812e23 /MAINTAINERS
parent9ddf1aeb2134e72275c97a2c6ff2e3eb04f2f27a (diff)
parent7da58046482fceb17c4a0d4afefd9507ec56de7f (diff)
downloadlinux-8058e14259ddc8c1824387198fc53700ed4cccc9.tar.bz2
Merge branch 'usb-audio-fix' of git://git.alsa-project.org/alsa-kprivate into for-linus
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 7281a7b9224b..ff60aac83dca 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6585,7 +6585,7 @@ F: drivers/media/platform/s3c-camif/
F: include/media/s3c_camif.h
SERIAL DRIVERS
-M: Alan Cox <alan@linux.intel.com>
+M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
L: linux-serial@vger.kernel.org
S: Maintained
F: drivers/tty/serial