diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-10 07:12:59 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-10 07:12:59 -0500 |
| commit | 515fedfeb6891f465bb1cc1ffe2e94e1b0d195a4 (patch) | |
| tree | badd99656471247ecd6d934ab7aad52e1cf6a50b | |
| parent | 94d5f7c0255bd712d68732a0180558d45fe6eac5 (diff) | |
| parent | 98d97019c88bd832da1457729739cf739ece493f (diff) | |
Merge branch 'for-3.2' into for-3.3
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c802e5fa2d1..fd7e441b5ea 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5648,7 +5648,6 @@ F: drivers/media/video/*7146* | |||
| 5648 | F: include/media/*7146* | 5648 | F: include/media/*7146* |
| 5649 | 5649 | ||
| 5650 | SAMSUNG AUDIO (ASoC) DRIVERS | 5650 | SAMSUNG AUDIO (ASoC) DRIVERS |
| 5651 | M: Jassi Brar <jassisinghbrar@gmail.com> | ||
| 5652 | M: Sangbeom Kim <sbkim73@samsung.com> | 5651 | M: Sangbeom Kim <sbkim73@samsung.com> |
| 5653 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) | 5652 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) |
| 5654 | S: Supported | 5653 | S: Supported |