diff --git a/[refs] b/[refs]
index 606f9a0b5f11..b6e4e2331cdd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5ca6918bc9f336fcbdca430697f5cac150f9376
+refs/heads/master: 69aefcead5da3bb9e4aa7e80a3b6da531560c7dc
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 156558ce68f5..42fd0961dcec 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -1362,7 +1362,6 @@ M:	timur@freescale.com
 L:	alsa-devel@alsa-project.org
 S:	Supported
 F:	sound/soc/codecs/cs4270*
-F:	sound/soc/fsl/mpc8610_hpcd.c
 
 CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER
 P:	Cirrus Logic Corporation (kernel 2.2 driver)
@@ -2250,7 +2249,8 @@ M:	timur@freescale.com
 L:	alsa-devel@alsa-project.org
 L:	linuxppc-dev@ozlabs.org
 S:	Supported
-F:	sound/soc/fsl/
+F:	sound/soc/fsl/fsl*
+F:	sound/soc/fsl/mpc8610_hpcd.c
 
 FREEVXFS FILESYSTEM
 P:	Christoph Hellwig