2 files changed, 4 insertions, 3 deletions
diff --git a/CREDITS b/CREDITS
index d7140309e06d..c5f819bacda3 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1745,8 +1745,9 @@ S: D-64295
 S: Germany
 N: Andi Kleen
-E: ak@muc.de
+E: andi@firstfloor.org
-D: network hacker, syncookies
+U: http://www.halobates.de
+D: network, x86, NUMA, various hacks
 S: Schwalbenstr. 96
 S: 85551 Ottobrunn
 S: Germany
diff --git a/MAINTAINERS b/MAINTAINERS
index af1c7926c153..a57589e2d38e 100644
--- a/MAINTAINERS
+++ b/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

diff --git a/CREDITS b/CREDITS index d7140309e06d..c5f819bacda3 100644 --- a/CREDITS +++ b/CREDITS
@@ -1745,8 +1745,9 @@ S: D-64295
1745	S: Germany	1745	S: Germany
1746		1746
1747	N: Andi Kleen	1747	N: Andi Kleen
1748	E: ak@muc.de	1748	E: andi@firstfloor.org
1749	D: network hacker, syncookies	1749	U: http://www.halobates.de
		1750	D: network, x86, NUMA, various hacks
1750	S: Schwalbenstr. 96	1751	S: Schwalbenstr. 96
1751	S: 85551 Ottobrunn	1752	S: 85551 Ottobrunn
1752	S: Germany	1753	S: Germany


diff --git a/MAINTAINERS b/MAINTAINERS index af1c7926c153..a57589e2d38e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS
@@ -1605,7 +1605,7 @@ S: Maintained
1605		1605
1606	HPET: x86_64	1606	HPET: x86_64
1607	P: Andi Kleen and Vojtech Pavlik	1607	P: Andi Kleen and Vojtech Pavlik
1608	M: ak@muc.de and vojtech@suse.cz	1608	M: andi@firstfloor.org and vojtech@suse.cz
1609	S: Maintained	1609	S: Maintained
1610		1610
1611	HPET: ACPI hpet.c	1611	HPET: ACPI hpet.c