diff --git a/[refs] b/[refs] index 02e3d863a5e7..e0d7626c646b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98ed12e6b48887f03d34c8162c0f8de1c2dcd203 +refs/heads/master: f0319efe1fb7dde97573ad42bc12d795cb4bc398 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index c2ed43858bce..080d297c9790 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2843,6 +2843,14 @@ L: netdev@vger.kernel.org S: Maintained F: drivers/net/ethernet/ibm/ehea/ +EM28XX VIDEO4LINUX DRIVER +M: Mauro Carvalho Chehab +L: linux-media@vger.kernel.org +W: http://linuxtv.org +T: git git://linuxtv.org/media_tree.git +S: Maintained +F: drivers/media/usb/em28xx/ + EMBEDDED LINUX M: Paul Gortmaker M: Matt Mackall