diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-20 11:23:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-20 11:23:18 -0700 |
| commit | 71e7ff2578c3bc67fd893a9ba7f69fd563f271de (patch) | |
| tree | 07f8f6e950f54f745857c6be07a5186fd68a74d2 /MAINTAINERS | |
| parent | 4a52246302f01596f0edf7b4a3e6425e23479192 (diff) | |
| parent | bc01caf53da4de53361376734707336de8fff839 (diff) | |
Merge tag 'staging-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull big staging driver updates from Greg KH:
"Here is the big drivers/staging/ merge for 3.4-rc1
Lots of new driver updates here, with the addition of a few new ones,
and only one moving out of the staging tree to the "real" part of the
kernel (the hyperv scsi driver, acked by the scsi maintainer).
There are also loads of cleanups, fixes, and other minor things in
here, all self-contained in the drivers/staging/ tree.
Overall we reversed the recent trend by adding more lines than we
removed:
379 files changed, 37952 insertions(+), 14153 deletions(-)"
* tag 'staging-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (360 commits)
staging/zmem: Use lockdep_assert_held instead of spin_is_locked
Staging: rtl8187se: r8180_wx.c: Cleaned up comments
Staging: rtl8187se: r8180_wx.c: Removed old comments
Staging: rtl8187se: r8180_dm.c: Removed old comments
Staging: android: ram_console.c:
Staging: rtl8187se: r8180_dm.c: Fix comments
Staging: rtl8187se: r8180_dm.c: Fix spacing issues
Staging: rtl8187se: r8180_dm.c Fixed indentation issues
Staging: rtl8187se: r8180_dm.c: Fix brackets
Staging: rtl8187se: r8180_dm.c: Removed spaces before tab stop
staging: vme: fix section mismatches in linux-next 20120314
Staging: rtl8187se: r8180_core.c: Fix some long line issues
Staging: rtl8187se: r8180_core.c: Fix some spacing issues
Staging: rtl8187se: r8180_core.c: Removed trailing spaces
staging: mei: remove driver internal versioning
Staging: rtl8187se: r8180_core.c: Cleaned up if statement
staging: ozwpan depends on NET
staging: ozwpan: added maintainer for ozwpan driver
staging/mei: propagate error codes up in the write flow
drivers:staging:mei Fix some typos in staging/mei
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9c63a43ab63a..71514d2afdd6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6395,6 +6395,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 <ckelly@ozmodevices.com> +S: Maintained +F: drivers/staging/ozwpan/ + STAGING - PARALLEL LCD/KEYPAD PANEL DRIVER M: Willy Tarreau <willy@meta-x.org> S: Odd Fixes |