diff --git a/[refs] b/[refs]
index f9bd3de5685d..f78ab190ee7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07f3331c6bfd27a06dfb0ca9fa4f06dec6606876
+refs/heads/master: 43c3ab308d0e8e6ad9a5fb24020eb59cd423a3db
diff --git a/trunk/CREDITS b/trunk/CREDITS
index d7140309e06d..c5f819bacda3 100644
--- a/trunk/CREDITS
+++ b/trunk/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
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index af1c7926c153..a57589e2d38e 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -1605,7 +1605,7 @@ S:	Maintained
 
 HPET:	x86_64
 P:	Andi Kleen and Vojtech Pavlik
-M:	ak@muc.de and vojtech@suse.cz
+M:	andi@firstfloor.org and vojtech@suse.cz
 S:	Maintained
 
 HPET:	ACPI hpet.c