Merge branch 'x86/jumplabel' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index afaa7cec6ea5126198d5220389f66d9678ed8949..9416a9a8b95e6c4404c80ade376feff7b6df406a 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -637,14 +637,13 @@ S: 14509 NE 39th Street #1096
 S: Bellevue, Washington 98007
 S: USA
 
-N: Christopher L. Cheney
-E: [email protected]
-E: [email protected]
-W: http://www.cheney.cx
+N: Chris Cheney
+E: [email protected]
+E: [email protected]
 P: 1024D/8E384AF2 2D31 1927 87D7 1F24 9FF9  1BC5 D106 5AB3 8E38 4AF2
 D: Vista Imaging usb webcam driver
-S: 314 Prince of Wales
-S: Conroe, TX 77304
+S: 2308 Therrell Way
+S: McKinney, TX 75070
 S: USA
 
 N: Stuart Cheshire
@@ -761,6 +760,10 @@ S: Northampton
 S: NN1 3QT
 S: United Kingdom
 
+N: Massimo Dal Zotto
+E: [email protected]
+D: i8k Dell laptop SMM driver
+
 N: Uwe Dannowski
 E: [email protected]
 W: http://i30www.ira.uka.de/~dannowsk/
@@ -1116,6 +1119,7 @@ D: author of userfs filesystem
 D: Improved mmap and munmap handling
 D: General mm minor tidyups
 D: autofs v4 maintainer
+D: Xen subsystem
 S: 987 Alabama St
 S: San Francisco
 S: CA, 94110