diff --git a/[refs] b/[refs] index 5d31d89ca7ca..7c01521654d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ccb7b6249f9bc50678e2a383084ed0a34cc9239 +refs/heads/master: 94cfdd15495dc896f3c8da0a54cb5502050f6096 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 9a648eb8e213..be1b08669faa 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6360,6 +6360,11 @@ W: http://wiki.laptop.org/go/DCON S: Odd Fixes F: drivers/staging/olpc_dcon/ +STAGING - OZMO DEVICES USB OVER WIFI DRIVER +M: Chris Kelly +S: Maintained +F: drivers/staging/ozwpan/ + STAGING - PARALLEL LCD/KEYPAD PANEL DRIVER M: Willy Tarreau S: Odd Fixes