diff --git a/[refs] b/[refs]
index b09810699281..4c6c4e891654 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ee3d4d53e4e170e9a9a70214de54b9f5d18d30c
+refs/heads/master: 98ded5904b0dca23146d4d80ad91ab800f35b576
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index b74fe217fa29..924a21f5ba1b 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -7586,6 +7586,11 @@ M:	David Täht <d@teklibre.com>
 S:	Odd Fixes
 F:	drivers/staging/frontier/
 
+STAGING - GO7007 MPEG CODEC
+M:	Hans Verkuil <hans.verkuil@cisco.com>
+S:	Maintained
+F:	drivers/staging/media/go7007/
+
 STAGING - INDUSTRIAL IO
 M:	Jonathan Cameron <jic23@cam.ac.uk>
 L:	linux-iio@vger.kernel.org