diff --git a/[refs] b/[refs]
index 067dcb28fb73..99f1efbbb9a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19c90aa678a166381609af574d2a993568f5f5bb
+refs/heads/master: b2b0186d0f98e7fc2c21a2a3514223ab248e46f6
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index dbf1676fe3c6..43083178cee8 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -6300,7 +6300,7 @@ STAGING - LIRC (LINUX INFRARED REMOTE CONTROL) DRIVERS
 M:	Jarod Wilson <jarod@wilsonet.com>
 W:	http://www.lirc.org/
 S:	Odd Fixes
-F:	drivers/staging/lirc/
+F:	drivers/staging/media/lirc/
 
 STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)
 M:	Julian Andres Klode <jak@jak-linux.org>
@@ -6336,7 +6336,7 @@ F:	drivers/staging/sm7xx/
 STAGING - SOFTLOGIC 6x10 MPEG CODEC
 M:	Ben Collins <bcollins@bluecherry.net>
 S:	Odd Fixes
-F:	drivers/staging/solo6x10/
+F:	drivers/staging/media/solo6x10/
 
 STAGING - SPEAKUP CONSOLE SPEECH DRIVER
 M:	William Hubbs <w.d.hubbs@gmail.com>