diff --git a/[refs] b/[refs] index b147fda156d8..462faf703d73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96a8d14e875a017f9e9e71d93433414e9fb8863f +refs/heads/master: 8edca3fe9efb43ba41e22f182546e874227b92cb diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index fa309ab7ccbf..49afc491dc13 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -7249,7 +7249,6 @@ F: drivers/staging/olpc_dcon/ STAGING - OZMO DEVICES USB OVER WIFI DRIVER M: Rupesh Gujare -M: Chris Kelly S: Maintained F: drivers/staging/ozwpan/ diff --git a/trunk/drivers/staging/ozwpan/TODO b/trunk/drivers/staging/ozwpan/TODO index b5db2456bffa..c71bd83d0d7c 100644 --- a/trunk/drivers/staging/ozwpan/TODO +++ b/trunk/drivers/staging/ozwpan/TODO @@ -11,5 +11,4 @@ TODO: Please send any patches for this driver to Rupesh Gujare -Chris Kelly and Greg Kroah-Hartman .