summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Cheney <chris.cheney@gmail.com>2013-08-05 07:37:42 +0400
committerJiri Kosina <jkosina@suse.cz>2013-08-05 13:28:12 +0400
commitccb7cc00774457ee0064c278a1bed4b9685364d3 (patch)
tree7de7d7703af2d8f90cdc2e948d8f1a9fa1c0d606
parenta24a4b9f3f7a4cfba3af0e8079e25972b88a5afa (diff)
downloadlinux-ccb7cc00774457ee0064c278a1bed4b9685364d3.tar.xz
credits: update contact information for Chris Cheney
Small clean-up for my CREDITS entry. Signed-off-by: Chris Cheney <chris.cheney@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--CREDITS11
-rw-r--r--drivers/media/usb/gspca/vicam.c2
2 files changed, 6 insertions, 7 deletions
diff --git a/CREDITS b/CREDITS
index 206d0fcf07a5..33a2f2d83009 100644
--- 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: ccheney@debian.org
-E: ccheney@cheney.cx
-W: http://www.cheney.cx
+N: Chris Cheney
+E: chris.cheney@gmail.com
+E: ccheney@redhat.com
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
diff --git a/drivers/media/usb/gspca/vicam.c b/drivers/media/usb/gspca/vicam.c
index d6890bc37198..a2275cfe0b81 100644
--- a/drivers/media/usb/gspca/vicam.c
+++ b/drivers/media/usb/gspca/vicam.c
@@ -6,7 +6,7 @@
* Based on the usbvideo vicam driver, which is:
*
* Copyright (c) 2002 Joe Burks (jburks@wavicle.org),
- * Christopher L Cheney (ccheney@cheney.cx),
+ * Chris Cheney (chris.cheney@gmail.com),
* Pavel Machek (pavel@ucw.cz),
* John Tyner (jtyner@cs.ucr.edu),
* Monroe Williams (monroe@pobox.com)