summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-01-27 22:38:57 -0800
committerOlof Johansson <olof@lixom.net>2013-01-27 22:38:57 -0800
commit7aeab5f13b741025aad699b60db8114ab5edee65 (patch)
treea3232cfca1dad3c76c735bd056f75782d9cfdcc1 /MAINTAINERS
parent20637018171c68d980f10a65a0ee0d51cb2657cb (diff)
parent949db153b6466c6f7cad5a427ecea94985927311 (diff)
Merge tag 'v3.8-rc5' into for-next
Linux 3.8-rc5
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c4066a554825..fd9959c174e8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6586,7 +6586,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