diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 21:19:55 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 21:19:55 -0400 |
| commit | 28a78e46f04ac5c4952533f2938a18699f207004 (patch) | |
| tree | 2991c5cea8d7f912abbe59e315fd1ed03febe45c /MAINTAINERS | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
| parent | b0d1f807f340e91b27aa721f6474956af11571da (diff) | |
Merge 3.5-rc7 into driver-core-next
This pulls in the printk fixes to the driver-core-next branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1b71f6ceae0a..63ccf7edec3d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2709,6 +2709,14 @@ M: Mimi Zohar <zohar@us.ibm.com> | |||
| 2709 | S: Supported | 2709 | S: Supported |
| 2710 | F: security/integrity/evm/ | 2710 | F: security/integrity/evm/ |
| 2711 | 2711 | ||
| 2712 | EXTERNAL CONNECTOR SUBSYSTEM (EXTCON) | ||
| 2713 | M: MyungJoo Ham <myungjoo.ham@samsung.com> | ||
| 2714 | M: Chanwoo Choi <cw00.choi@samsung.com> | ||
| 2715 | L: linux-kernel@vger.kernel.org | ||
| 2716 | S: Maintained | ||
| 2717 | F: drivers/extcon/ | ||
| 2718 | F: Documentation/extcon/ | ||
| 2719 | |||
| 2712 | EXYNOS DP DRIVER | 2720 | EXYNOS DP DRIVER |
| 2713 | M: Jingoo Han <jg1.han@samsung.com> | 2721 | M: Jingoo Han <jg1.han@samsung.com> |
| 2714 | L: linux-fbdev@vger.kernel.org | 2722 | L: linux-fbdev@vger.kernel.org |