diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 14:14:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 14:14:02 -0800 |
| commit | 9aef3b7c208b216b54a2e6614c6287ca8a09cf6f (patch) | |
| tree | 0d6b41a55c4e6a4dd1135d76aeb8b12c7b9841bb /MAINTAINERS | |
| parent | e0ae23550ffd3bfe319fa66879779be1a9a4a155 (diff) | |
| parent | 61d67f2e07d96d20d86135792ca591c491939c27 (diff) | |
| download | kernel-crypto-9aef3b7c208b216b54a2e6614c6287ca8a09cf6f.tar.gz kernel-crypto-9aef3b7c208b216b54a2e6614c6287ca8a09cf6f.tar.xz kernel-crypto-9aef3b7c208b216b54a2e6614c6287ca8a09cf6f.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3f8a90ac47d..a37a2b38a55 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1176,8 +1176,8 @@ T: git kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git S: Maintained SN-IA64 (Itanium) SUB-PLATFORM -P: Greg Edwards -M: edwardsg@sgi.com +P: Jes Sorensen +M: jes@sgi.com L: linux-altix@sgi.com L: linux-ia64@vger.kernel.org W: http://www.sgi.com/altix |