diff --git a/[refs] b/[refs] index 0212fe33df9c..93e837202201 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9555159591a044bffa9674db25f3e6329070fc3 +refs/heads/master: ebd3d0108f134f2109051f618028128537f91ab1 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 29b36bfcc0e7..12ff53e87b37 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6045,6 +6045,12 @@ M: Jakub Schmidtke S: Odd Fixes F: drivers/staging/asus_oled/ +STAGING - COMEDI +M: Ian Abbott +M: Mori Hess +S: Odd Fixes +F: drivers/staging/comedi/ + STARFIRE/DURALAN NETWORK DRIVER M: Ion Badulescu S: Odd Fixes