diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-05 14:57:33 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-05 14:57:33 +1100 |
| commit | 06c7e40704205b3d4eca1c0b92e2dd4d8d684efd (patch) | |
| tree | 4f99beac45a385fb342c37443d86116f8aa73a16 /MAINTAINERS | |
| parent | 02e0d3bc772b8c122fecf6216c6691202f74ae15 (diff) | |
| parent | 5056d87a889d1bd7d998070b6827b384ccde487f (diff) | |
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/et131x/et131x.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8a78682946ba..3b4d6bf30d54 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7522,8 +7522,7 @@ S: Odd Fixes F: drivers/staging/olpc_dcon/ STAGING - OZMO DEVICES USB OVER WIFI DRIVER -M: Rupesh Gujare <rgujare@ozmodevices.com> -M: Chris Kelly <ckelly@ozmodevices.com> +M: Rupesh Gujare <rupesh.gujare@atmel.com> S: Maintained F: drivers/staging/ozwpan/ |