diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 15:34:27 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 15:34:27 -0500 |
| commit | 74790147fb4e9b71083a62a525ab283a275d63b7 (patch) | |
| tree | 2805293e7f1806ce2fd804255f868ab94edeae88 /MAINTAINERS | |
| parent | f6dcf8e747a0723ace5275334bacfcd88ab39333 (diff) | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
Merge 3.8-rc5 into char-misc-next
This pulls in all of the 3.8-rc5 fixes into this branch so we can test easier.
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 18b1602e6888..75fd3e0b76fd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -6592,7 +6592,7 @@ F: drivers/media/platform/s3c-camif/ | |||
| 6592 | F: include/media/s3c_camif.h | 6592 | F: include/media/s3c_camif.h |
| 6593 | 6593 | ||
| 6594 | SERIAL DRIVERS | 6594 | SERIAL DRIVERS |
| 6595 | M: Alan Cox <alan@linux.intel.com> | 6595 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 6596 | L: linux-serial@vger.kernel.org | 6596 | L: linux-serial@vger.kernel.org |
| 6597 | S: Maintained | 6597 | S: Maintained |
| 6598 | F: drivers/tty/serial | 6598 | F: drivers/tty/serial |