X-Git-Url: https://git.proxmox.com/?p=mirror_ubuntu-zesty-kernel.git;a=blobdiff_plain;f=CREDITS;h=c5626bf06264e41e136fbe0c0420881e72de0ce2;hp=c58560701d13158f535046c09fd4b825922ced94;hb=f14180d091364aeb1473123614327452e3a2a1cb;hpb=4a401ceeef7bf3bc55f5e913cbf19d6038cf83c6 diff --git a/CREDITS b/CREDITS index c58560701d13..c5626bf06264 100644 --- a/CREDITS +++ b/CREDITS @@ -2478,12 +2478,11 @@ S: D-90453 Nuernberg S: Germany N: Arnaldo Carvalho de Melo -E: acme@ghostprotocols.net +E: acme@kernel.org E: arnaldo.melo@gmail.com E: acme@redhat.com -W: http://oops.ghostprotocols.net:81/blog/ P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01 -D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks +D: tools/, IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks S: Brazil N: Karsten Merker