Merge branch 'server-cluster-locking-api' of git://linux-nfs.org/~bfields/linux

[linux-drm-fsl-dcu.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index d7140309e06d188e0c03d35b890c4010515cb556..c5f819bacda3e28322c391af965558dd37ab2dd8 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -1745,8 +1745,9 @@ S: D-64295
 S: Germany
 
 N: Andi Kleen
-E: ak@muc.de
-D: network hacker, syncookies
+E: andi@firstfloor.org
+U: http://www.halobates.de
+D: network, x86, NUMA, various hacks
 S: Schwalbenstr. 96
 S: 85551 Ottobrunn
 S: Germany