aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <greg@kroah.com>2004-09-12 20:02:40 -0700
committerGreg Kroah-Hartman <greg@kroah.com>2004-09-12 20:02:40 -0700
commit2a69c9cd33412d9a7f393dcd9382ab9ed034d3fa (patch)
tree26e60a470b9eb566c327aa64a4d7453423549a23 /CREDITS
parent8a690d16e64e76f884d74128dc10ac6b28c135d2 (diff)
parent26d61c640c05c6cf04987437fad260908faaddf7 (diff)
downloadhistory-2a69c9cd33412d9a7f393dcd9382ab9ed034d3fa.tar.gz
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/usb-2.6
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS2
1 files changed, 1 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index bb348015fb7736..644ee6b2dffb14 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2763,7 +2763,7 @@ N: Luca Risolia
E: luca.risolia@studio.unibo.it
P: 1024D/FCE635A4 88E8 F32F 7244 68BA 3958 5D40 99DA 5D2A FCE6 35A4
D: V4L driver for W996[87]CF JPEG USB Dual Mode Camera Chips
-D: V4L2 driver for SN9C10[12] PC Camera Controllers
+D: V4L2 driver for SN9C10x PC Camera Controllers
S: Via Liberta' 41/A
S: Osio Sotto, 24046, Bergamo
S: Italy