diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 15:41:02 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 15:41:02 -0500 |
commit | 67635d397a643514fdfa859f611b86bd3ad8958d (patch) | |
tree | b5df6d79b35cde39c00f0cc1432f128f473d4d6e /MAINTAINERS | |
parent | 192fef18d0f5ac9a05a93ff6314fc9865c10fbf9 (diff) | |
parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) |
Merge 3.8-rc5 into usb-next
This fixes up a conflict with drivers/usb/serial/io_ti.c that came up in
linux-next.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8e1c7a380dcc..c5b37de336ca 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -6585,7 +6585,7 @@ F: drivers/media/platform/s3c-camif/ | |||
6585 | F: include/media/s3c_camif.h | 6585 | F: include/media/s3c_camif.h |
6586 | 6586 | ||
6587 | SERIAL DRIVERS | 6587 | SERIAL DRIVERS |
6588 | M: Alan Cox <alan@linux.intel.com> | 6588 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
6589 | L: linux-serial@vger.kernel.org | 6589 | L: linux-serial@vger.kernel.org |
6590 | S: Maintained | 6590 | S: Maintained |
6591 | F: drivers/tty/serial | 6591 | F: drivers/tty/serial |