diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-19 20:48:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-19 20:48:32 -0400 |
commit | fb20871a54961b82d35303b43452928186c1361d (patch) | |
tree | 1beeb39e45eda1c8b5893090904b583fceeb07ef /MAINTAINERS | |
parent | bee89ab228e6f51c4ddd3481b9bd491859a8ee7b (diff) | |
parent | c7a5d70796379e3d51d0c652fbe1634b81d3bbd5 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (342 commits)
Staging: comedi: fix build errors
Staging: udlfb: update to version 0.2.3
Staging: udlfb: fix some sparse warnings.
Staging: udlfb: clean up checkpatch warnings in udlfb.c
Staging: udlfb: clean up checkpatch warnings in udlfb.h
Staging: udlfb: add udlfb driver to build
Staging: add udlfb driver
Staging: pata_rdc: remove pointless comments
Staging: pata_rdc: remove DRIVER macros
Staging: pata_rdc: remove dbgprintf macro
Staging: pata_rdc: remove broken flag
Staging: pata_rdc: fix build warnings
Staging: pata_rdc: use PCI_DEVICE
Staging: pata_rdc: remove function prototypes
Staging: pata_rdc: coding style fixes
Staging: pata_rdc: convert code to work in 2.6.29
Staging: pata_rdc: add driver to the build system
Staging: add pata_rdc driver
Staging: remove obsolete serqt_usb driver
Staging: serqt_usb2 add the driver to the build
...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a08882ea6861..dc226e78612c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -5479,6 +5479,7 @@ STAGING SUBSYSTEM | |||
5479 | P: Greg Kroah-Hartman | 5479 | P: Greg Kroah-Hartman |
5480 | M: gregkh@suse.de | 5480 | M: gregkh@suse.de |
5481 | T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ | 5481 | T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ |
5482 | L: devel@driverdev.osuosl.org | ||
5482 | S: Maintained | 5483 | S: Maintained |
5483 | F: drivers/staging/ | 5484 | F: drivers/staging/ |
5484 | 5485 | ||