diff --git a/[refs] b/[refs] index dcc2119976fa..5bddb7271ba2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0158e98fa15f6980568d7c3f67f035d3783319cd +refs/heads/master: d2fa21876147005ba942cef1d9e5a5039b4326bd diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index f427294b85e0..f8bd5814bdda 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4677,13 +4677,12 @@ F: drivers/media/video/*7146* F: include/media/*7146* TLG2300 VIDEO4LINUX-2 DRIVER -M Huang Shijie -M Kang Yong -M Zhang Xiaobing +M: Huang Shijie +M: Kang Yong +M: Zhang Xiaobing S: Supported F: drivers/media/video/tlg2300 - SC1200 WDT DRIVER M: Zwane Mwaikambo S: Maintained