diff options
author | Paul Mackerras <paulus@samba.org> | 2008-12-18 11:06:12 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-12-18 11:06:12 +1100 |
commit | c280266a326ccabeb64b6d69fa4fd21faf5bf354 (patch) | |
tree | f8a89e593a0ba43b75bb666d8e245b2460dc0d40 /MAINTAINERS | |
parent | eddce368f99b682683e09cf206eaa25131d40abe (diff) | |
parent | 55dac3a5553b13891f0ae4bbd11920619b5436d4 (diff) |
Merge branch 'linux-2.6' into next
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 24741de12a3..09ed704f4dd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1527,10 +1527,10 @@ W: http://ebtables.sourceforge.net/ S: Maintained ECRYPT FILE SYSTEM -P: Mike Halcrow, Phillip Hellewell -M: mhalcrow@us.ibm.com, phillip@hellewell.homeip.net -L: ecryptfs-devel@lists.sourceforge.net -W: http://ecryptfs.sourceforge.net/ +P: Tyler Hicks, Dustin Kirkland +M: tyhicks@linux.vnet.ibm.com, kirkland@canonical.com +L: ecryptfs-devel@lists.launchpad.net +W: https://launchpad.net/ecryptfs S: Supported EDAC-CORE |