diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-01 16:45:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-01 16:45:00 -0700 |
| commit | c12e69c6aaf785fd307d05cb6f36ca0e7577ead7 (patch) | |
| tree | d12feba57d1f42f8a2a1a382d3bea29603312d14 /MAINTAINERS | |
| parent | 158e0d3621683ee0cdfeeba56f0e5ddd97ae984f (diff) | |
| parent | 94debda32429e1a348fec8543245f1190a92d68c (diff) | |
Merge tag 'staging-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver updates from Greg KH:
"Here's the huge drivers/staging/ update for 3.15-rc1.
Loads of cleanup fixes, a few drivers removed, and some new ones
added.
All have been in linux-next for a while"
* tag 'staging-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1375 commits)
staging: xillybus: XILLYBUS_PCIE depends on PCI_MSI
staging: xillybus: Added "select CRC32" for XILLYBUS in Kconfig
staging: comedi: poc: remove obsolete driver
staging: unisys: replace kzalloc/kfree with UISMALLOC/UISFREE
staging: octeon-usb: prevent memory corruption
staging: usbip: fix line over 80 characters
staging: usbip: fix quoted string split across lines
Staging: unisys: Remove RETINT macro
Staging: unisys: Remove FAIL macro
Staging: unisys: Remove RETVOID macro
Staging: unisys: Remove RETPTR macro
Staging: unisys: Remove RETBOOL macro
Staging: unisys: Remove FAIL_WPOSTCODE_1 macro
Staging: unisys: Cleanup macros to get rid of goto statements
Staging: unisys: include: Remove unused macros from timskmod.h
staging: dgap: fix the rest of the checkpatch warnings in dgap.c
Staging: bcm: Remove unnecessary parentheses
staging: wlags49_h2: Delete unnecessary braces
staging: wlags49_h2: Do not use assignment in if condition
staging: wlags49_h2: Enclose macro in a do-while loop
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4a2ea1a168b..48a88402c25 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8394,6 +8394,12 @@ M: Teddy Wang <teddy.wang@siliconmotion.com.cn> S: Odd Fixes F: drivers/staging/sm7xxfb/ +STAGING - SLICOSS +M: Lior Dotan <liodot@gmail.com> +M: Christopher Harrer <charrer@alacritech.com> +S: Odd Fixes +F: drivers/staging/slicoss/ + STAGING - SOFTLOGIC 6x10 MPEG CODEC M: Ismael Luceno <ismael.luceno@corp.bluecherry.net> S: Supported @@ -9079,6 +9085,13 @@ F: drivers/cdrom/cdrom.c F: include/linux/cdrom.h F: include/uapi/linux/cdrom.h +UNISYS S-PAR DRIVERS +M: Benjamin Romer <benjamin.romer@unisys.com> +M: David Kershner <david.kershner@unisys.com> +L: sparmaintainer@unisys.com (Unisys internal) +S: Supported +F: drivers/staging/unisys/ + UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER M: Vinayak Holikatti <vinholikatti@gmail.com> M: Santosh Y <santoshsy@gmail.com> |