diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-08-09 23:20:49 +0200 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-08-09 23:20:49 +0200 |
commit | 471417c9cfb4c2574e2c03bf2273fe12f5388a8e (patch) | |
tree | ac026ba976bc253fc87a5cdec8f33d24d03e1c9c /CREDITS | |
parent | [SCSI] iscsi: fix 64 bit compile warning (diff) | |
parent | [PATCH] i2o: remove new configuration API (diff) | |
download | linux-471417c9cfb4c2574e2c03bf2273fe12f5388a8e.tar.xz linux-471417c9cfb4c2574e2c03bf2273fe12f5388a8e.zip |
Merge ../linux-2.6
Diffstat (limited to 'CREDITS')
-rw-r--r-- | CREDITS | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2380,8 +2380,8 @@ E: tmolina@cablespeed.com D: bug fixes, documentation, minor hackery N: James Morris -E: jmorris@redhat.com -W: http://www.intercode.com.au/jmorris/ +E: jmorris@namei.org +W: http://namei.org/ D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec, D: Crypto API, general networking, miscellaneous. S: PO Box 707 |