diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-08 22:33:45 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-08 22:33:45 -0400 |
| commit | 70da1dc052349b75a91fea1198258c99cea03390 (patch) | |
| tree | 20e938d8a10c0c2ad962e211cb558aee5d45a615 | |
| parent | 0d86733cce776ca0262b850ee8eb46bc52dc8244 (diff) | |
| parent | b9cbfcbe260c43bac3a6d941b095cc4dcf70e614 (diff) | |
Merge branch 'for-2.6.39' into for-2.6.40
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6b4b9cdec370..c4fb13f59f3d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5390,7 +5390,7 @@ F: drivers/media/video/*7146* | |||
| 5390 | F: include/media/*7146* | 5390 | F: include/media/*7146* |
| 5391 | 5391 | ||
| 5392 | SAMSUNG AUDIO (ASoC) DRIVERS | 5392 | SAMSUNG AUDIO (ASoC) DRIVERS |
| 5393 | M: Jassi Brar <jassi.brar@samsung.com> | 5393 | M: Jassi Brar <jassisinghbrar@gmail.com> |
| 5394 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) | 5394 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) |
| 5395 | S: Supported | 5395 | S: Supported |
| 5396 | F: sound/soc/samsung | 5396 | F: sound/soc/samsung |