diff --git a/[refs] b/[refs] index 93e837202201..16cb1e00eb21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebd3d0108f134f2109051f618028128537f91ab1 +refs/heads/master: 8ca572c92089c1b8e7ae92ccdcddf3ab5a7b9385 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 12ff53e87b37..64eb845cc7dc 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6051,6 +6051,14 @@ M: Mori Hess S: Odd Fixes F: drivers/staging/comedi/ +STAGING - CRYSTAL HD VIDEO DECODER +M: Naren Sankar +M: Jarod Wilson +M: Scott Davilla +M: Manu Abraham +S: Odd Fixes +F: drivers/staging/crystalhd/ + STARFIRE/DURALAN NETWORK DRIVER M: Ion Badulescu S: Odd Fixes