diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 21:44:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 21:44:12 -0500 |
| commit | db9edfd7e339ca4113153d887e782dd05be5a9eb (patch) | |
| tree | 0a4ba12447a0cabc800adc7e9667d284777b0181 /MAINTAINERS | |
| parent | 631b034724364b413e8a52e7c2e03a9d77e4c2b4 (diff) | |
| parent | fd586bacf439f36dea9b9bf6e6133ac87df2730c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
Trivial manual merge fixup for usb_find_interface clashes.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1e59d3966012..6246b7f11632 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1480,12 +1480,6 @@ W: http://nfs.sourceforge.net/ | |||
| 1480 | W: http://www.cse.unsw.edu.au/~neilb/patches/linux-devel/ | 1480 | W: http://www.cse.unsw.edu.au/~neilb/patches/linux-devel/ |
| 1481 | S: Maintained | 1481 | S: Maintained |
| 1482 | 1482 | ||
| 1483 | KERNEL EVENT LAYER (KOBJECT_UEVENT) | ||
| 1484 | P: Robert Love | ||
| 1485 | M: rml@novell.com | ||
| 1486 | L: linux-kernel@vger.kernel.org | ||
| 1487 | S: Maintained | ||
| 1488 | |||
| 1489 | KEXEC | 1483 | KEXEC |
| 1490 | P: Eric Biederman | 1484 | P: Eric Biederman |
| 1491 | P: Randy Dunlap | 1485 | P: Randy Dunlap |