Merge branch 'linus' into release

1 files changed, 18 insertions, 1 deletions

diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt
index 004818fab040..1c58a7630146 100644
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
@@ -50,9 +50,14 @@ ov519		045e:028c	Micro$oft xbox cam
 spca508         0461:0815       Micro Innovation IC200
 sunplus         0461:0821       Fujifilm MV-1
 zc3xx           0461:0a00       MicroInnovation WebCam320
+stv06xx         046d:0840       QuickCam Express
+stv06xx         046d:0850       LEGO cam / QuickCam Web
+stv06xx         046d:0870       Dexxa WebCam USB
 spca500         046d:0890       Logitech QuickCam traveler
 vc032x          046d:0892       Logitech Orbicam
 vc032x          046d:0896       Logitech Orbicam
+vc032x          046d:0897       Logitech QuickCam for Dell notebooks
+zc3xx           046d:089d       Logitech QuickCam E2500
 zc3xx           046d:08a0       Logitech QC IM
 zc3xx           046d:08a1       Logitech QC IM 0x08A1 +sound
 zc3xx           046d:08a2       Labtec Webcam Pro
@@ -169,6 +174,9 @@ spca500		06bd:0404	Agfa CL20
 spca500         06be:0800       Optimedia
 sunplus         06d6:0031       Trust 610 LCD PowerC@m Zoom
 spca506         06e1:a190       ADS Instant VCD
+ov534           06f8:3002       Hercules Blog Webcam
+ov534           06f8:3003       Hercules Dualpix HD Weblog
+sonixj          06f8:3004       Hercules Classic Silver
 spca508         0733:0110       ViewQuest VQ110
 spca508         0130:0130       Clone Digital Webcam 11043
 spca501         0733:0401       Intel Create and Share
@@ -199,7 +207,8 @@ sunplus		08ca:2050	Medion MD 41437
 sunplus         08ca:2060       Aiptek PocketDV5300
 tv8532          0923:010f       ICM532 cams
 mars            093a:050f       Mars-Semi Pc-Camera
-pac207          093a:2460       PAC207 Qtec Webcam 100
+pac207          093a:2460       Qtec Webcam 100
+pac207          093a:2461       HP Webcam
 pac207          093a:2463       Philips SPC 220 NC
 pac207          093a:2464       Labtec Webcam 1200
 pac207          093a:2468       PAC207
@@ -213,10 +222,13 @@ pac7311		093a:2603	PAC7312
 pac7311         093a:2608       Trust WB-3300p
 pac7311         093a:260e       Gigaware VGA PC Camera, Trust WB-3350p, SIGMA cam 2350
 pac7311         093a:260f       SnakeCam
+pac7311         093a:2620       Apollo AC-905
 pac7311         093a:2621       PAC731x
+pac7311         093a:2622       Genius Eye 312
 pac7311         093a:2624       PAC7302
 pac7311         093a:2626       Labtec 2200
 pac7311         093a:262a       Webcam 300k
+pac7311         093a:262c       Philips SPC 230 NC
 zc3xx           0ac8:0302       Z-star Vimicro zc0302
 vc032x          0ac8:0321       Vimicro generic vc0321
 vc032x          0ac8:0323       Vimicro Vc0323
@@ -249,11 +261,13 @@ sonixj		0c45:60c0	Sangha Sn535
 sonixj          0c45:60ec       SN9C105+MO4000
 sonixj          0c45:60fb       Surfer NoName
 sonixj          0c45:60fc       LG-LIC300
+sonixj          0c45:60fe       Microdia Audio
 sonixj          0c45:6128       Microdia/Sonix SNP325
 sonixj          0c45:612a       Avant Camera
 sonixj          0c45:612c       Typhoon Rasy Cam 1.3MPix
 sonixj          0c45:6130       Sonix Pccam
 sonixj          0c45:6138       Sn9c120 Mo4000
+sonixj          0c45:613a       Microdia Sonix PC Camera
 sonixj          0c45:613b       Surfer SN-206
 sonixj          0c45:613c       Sonix Pccam168
 sonixj          0c45:6143       Sonix Pccam168
@@ -263,6 +277,9 @@ etoms		102c:6251	Qcam xxxxxx VGA
 zc3xx           10fd:0128       Typhoon Webshot II USB 300k 0x0128
 spca561         10fd:7e50       FlyCam Usb 100
 zc3xx           10fd:8050       Typhoon Webshot II USB 300k
+ov534           1415:2000       Sony HD Eye for PS3 (SLEH 00201)
+pac207          145f:013a       Trust WB-1300N
+vc032x          15b8:6002       HP 2.0 Megapixel rz406aa
 spca501         1776:501c       Arowana 300K CMOS Camera
 t613            17a1:0128       TASCORP JPEG Webcam, NGS Cyclops
 vc032x          17ef:4802       Lenovo Vc0323+MI1310_SOC