diff --git a/[refs] b/[refs] index 7de721096bed..28e33e3a2707 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38533698dc14e739eefb22cf66c048e3c9264313 +refs/heads/master: 7a93941975a95dd3be319128552fea71867724d7 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 8e6548dbd5db..0c6e84a49ec7 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5115,7 +5115,7 @@ SAMSUNG AUDIO (ASoC) DRIVERS M: Jassi Brar L: alsa-devel@alsa-project.org (moderated for non-subscribers) S: Supported -F: sound/soc/s3c24xx +F: sound/soc/samsung TLG2300 VIDEO4LINUX-2 DRIVER M: Huang Shijie