diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 15:58:36 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 15:58:36 -0500 |
| commit | 8733cb29d60fd2ca6c1f50f69f9b90fbfcd1879b (patch) | |
| tree | e6bef80539d3ada338f3f72733253b995df7e5c7 /MAINTAINERS | |
| parent | eed5ee1a3ab3020168cd67fdde2500452b0628c9 (diff) | |
| parent | 318af55ddd38bdaaa2b57f5c3bd394f3ce3a2610 (diff) | |
Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
uio: Change mail address of Hans J. Koch
driver core: prune docs about device_interface
driver core: the development tree has switched to git
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 74b8e050bf7..1a1c27b9c55 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2060,7 +2060,7 @@ F: Documentation/blockdev/drbd/ | |||
| 2060 | 2060 | ||
| 2061 | DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS | 2061 | DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS |
| 2062 | M: Greg Kroah-Hartman <gregkh@suse.de> | 2062 | M: Greg Kroah-Hartman <gregkh@suse.de> |
| 2063 | T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ | 2063 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git |
| 2064 | S: Supported | 2064 | S: Supported |
| 2065 | F: Documentation/kobject.txt | 2065 | F: Documentation/kobject.txt |
| 2066 | F: drivers/base/ | 2066 | F: drivers/base/ |