diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 12:01:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 12:01:32 -0500 |
| commit | 5b2f7ffcb734d3046144dfbd5ac6d76254a9e522 (patch) | |
| tree | 8290f03bcd6af331d7a401282028acfeea37d1de /MAINTAINERS | |
| parent | 333c47c847c90aaefde8b593054d9344106333b5 (diff) | |
| parent | b7c4a9f83f3c0f6f2a2750a389a9b758c3d9e9d2 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3ccbfa96eeec..995bfd8e6e7f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2481,10 +2481,10 @@ L: linux-kernel@vger.kernel.org | |||
| 2481 | S: Maintained | 2481 | S: Maintained |
| 2482 | 2482 | ||
| 2483 | TRIVIAL PATCHES | 2483 | TRIVIAL PATCHES |
| 2484 | P: Rusty Russell | 2484 | P: Adrian Bunk |
| 2485 | M: trivial@rustcorp.com.au | 2485 | M: trivial@kernel.org |
| 2486 | L: linux-kernel@vger.kernel.org | 2486 | L: linux-kernel@vger.kernel.org |
| 2487 | W: http://www.kernel.org/pub/linux/kernel/people/rusty/trivial/ | 2487 | W: http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/ |
| 2488 | S: Maintained | 2488 | S: Maintained |
| 2489 | 2489 | ||
| 2490 | TMS380 TOKEN-RING NETWORK DRIVER | 2490 | TMS380 TOKEN-RING NETWORK DRIVER |