diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-10 08:05:35 -0700 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-10 08:05:35 -0700 |
| commit | a47fd3f5e3a3f970ac1b81643ac56737f97a1fea (patch) | |
| tree | 09bafe2399f187898ddc6a74176893f0b7f28c6b /CREDITS | |
| parent | ef6724e32142c2d9ca252d423cacc435c142734e (diff) | |
| parent | 86b3786078d63242d3194ffc58ae8dae1d1bbef3 (diff) | |
| download | linux-3.10-a47fd3f5e3a3f970ac1b81643ac56737f97a1fea.tar.gz linux-3.10-a47fd3f5e3a3f970ac1b81643ac56737f97a1fea.tar.bz2 linux-3.10-a47fd3f5e3a3f970ac1b81643ac56737f97a1fea.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
french@hera:~/linux-2.6(0)$ cg-update
l
`/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/refs/heads/master' ->
`.git/refs/heads/origin'
cp: cannot create link `.git/objects/info/packs': File exists
progress: 213 objects, 646653 bytes, 77% done
`/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/objects/info/packs' ->
`.git/objects/info/packs'
progress: 983 objects, 2805763 bytes, 100% done
cg-pull: objects pull failed
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 |