diff --git a/[refs] b/[refs] index f6d69fe669f0..c94f886817ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5269395f5e2971b3a8d0a5473d7691347a50a64 +refs/heads/master: d6fad50237dd5773e1467497ee9fd352e5fd66f5 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index cf5983c54a94..df6b956869fa 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -8165,6 +8165,14 @@ L: linux-edac@vger.kernel.org S: Maintained F: arch/x86/kernel/cpu/mcheck/* +XC2028/3028 TUNER 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/tuners/tuner-xc2028.* + XEN HYPERVISOR INTERFACE M: Konrad Rzeszutek Wilk M: Jeremy Fitzhardinge