Merge commit 'v2.6.36' into kbuild/misc

Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).

1 files changed, 32 insertions, 7 deletions

diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt
index 1800a62cf135..56ba7bba7168 100644
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
@@ -29,8 +29,12 @@ zc3xx		041e:4029	Creative WebCam Vista Pro
 zc3xx           041e:4034       Creative Instant P0620
 zc3xx           041e:4035       Creative Instant P0620D
 zc3xx           041e:4036       Creative Live !
+sq930x          041e:4038       Creative Joy-IT
 zc3xx           041e:403a       Creative Nx Pro 2
 spca561         041e:403b       Creative Webcam Vista (VF0010)
+sq930x          041e:403c       Creative Live! Ultra
+sq930x          041e:403d       Creative Live! Ultra for Notebooks
+sq930x          041e:4041       Creative Live! Motion
 zc3xx           041e:4051       Creative Live!Cam Notebook Pro (VF0250)
 ov519           041e:4052       Creative Live! VISTA IM
 zc3xx           041e:4053       Creative Live!Cam Video IM
@@ -42,6 +46,7 @@ ov519		041e:4064	Creative Live! VISTA VF0420
 ov519           041e:4067       Creative Live! Cam Video IM (VF0350)
 ov519           041e:4068       Creative Live! VISTA VF0470
 spca561         0458:7004       Genius VideoCAM Express V2
+sn9c2028        0458:7005       Genius Smart 300, version 2
 sunplus         0458:7006       Genius Dsc 1.3 Smart
 zc3xx           0458:7007       Genius VideoCam V2
 zc3xx           0458:700c       Genius VideoCam V3
@@ -49,6 +54,8 @@ zc3xx		0458:700f	Genius VideoCam Web V2
 sonixj          0458:7025       Genius Eye 311Q
 sn9c20x         0458:7029       Genius Look 320s
 sonixj          0458:702e       Genius Slim 310 NB
+sn9c20x         0458:704a       Genius Slim 1320
+sn9c20x         0458:704c       Genius i-Look 1321
 sn9c20x         045e:00f4       LifeCam VX-6000 (SN9C20x + OV9650)
 sonixj          045e:00f5       MicroSoft VX3000
 sonixj          045e:00f7       MicroSoft VX1000
@@ -109,6 +116,7 @@ sunplus		04a5:3003	Benq DC 1300
 sunplus         04a5:3008       Benq DC 1500
 sunplus         04a5:300a       Benq DC 3410
 spca500         04a5:300c       Benq DC 1016
+benq            04a5:3035       Benq DC E300
 finepix         04cb:0104       Fujifilm FinePix 4800
 finepix         04cb:0109       Fujifilm FinePix A202
 finepix         04cb:010b       Fujifilm FinePix A203
@@ -134,6 +142,7 @@ finepix		04cb:013d	Fujifilm FinePix unknown model
 finepix         04cb:013f       Fujifilm FinePix F420
 sunplus         04f1:1001       JVC GC A50
 spca561         04fc:0561       Flexcam 100
+spca1528        04fc:1528       Sunplus MD80 clone
 sunplus         04fc:500c       Sunplus CA500C
 sunplus         04fc:504a       Aiptek Mini PenCam 1.3
 sunplus         04fc:504b       Maxell MaxPocket LE 1.3
@@ -142,6 +151,7 @@ sunplus		04fc:5360	Sunplus Generic
 spca500         04fc:7333       PalmPixDC85
 sunplus         04fc:ffff       Pure DigitalDakota
 spca501         0506:00df       3Com HomeConnect Lite
+sunplus         052b:1507       Megapixel 5 Pretec DC-1007
 sunplus         052b:1513       Megapix V4
 sunplus         052b:1803       MegaImage VI
 tv8532          0545:808b       Veo Stingray
@@ -151,6 +161,7 @@ sunplus		0546:3191	Polaroid Ion 80
 sunplus         0546:3273       Polaroid PDC2030
 ov519           054c:0154       Sonny toy4
 ov519           054c:0155       Sonny toy5
+cpia1           0553:0002       CPIA CPiA (version1) based cameras
 zc3xx           055f:c005       Mustek Wcam300A
 spca500         055f:c200       Mustek Gsmart 300
 sunplus         055f:c211       Kowa Bs888e Microcamera
@@ -188,8 +199,7 @@ 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
+ov534_9         06f8:3003       Hercules Dualpix HD Weblog
 sonixj          06f8:3004       Hercules Classic Silver
 sonixj          06f8:3008       Hercules Deluxe Optical Glass
 pac7302         06f8:3009       Hercules Classic Link
@@ -204,6 +214,7 @@ sunplus		0733:2221	Mercury Digital Pro 3.1p
 sunplus         0733:3261       Concord 3045 spca536a
 sunplus         0733:3281       Cyberpix S550V
 spca506         0734:043b       3DeMon USB Capture aka
+cpia1           0813:0001       QX3 camera
 ov519           0813:0002       Dual Mode USB Camera Plus
 spca500         084d:0003       D-Link DSC-350
 spca500         08ca:0103       Aiptek PocketDV
@@ -225,7 +236,8 @@ sunplus		08ca:2050	Medion MD 41437
 sunplus         08ca:2060       Aiptek PocketDV5300
 tv8532          0923:010f       ICM532 cams
 mars            093a:050f       Mars-Semi Pc-Camera
-mr97310a        093a:010f       Sakar Digital no. 77379
+mr97310a        093a:010e       All known CIF cams with this ID
+mr97310a        093a:010f       All known VGA cams with this ID
 pac207          093a:2460       Qtec Webcam 100
 pac207          093a:2461       HP Webcam
 pac207          093a:2463       Philips SPC 220 NC
@@ -246,6 +258,7 @@ pac7302		093a:2620	Apollo AC-905
 pac7302         093a:2621       PAC731x
 pac7302         093a:2622       Genius Eye 312
 pac7302         093a:2624       PAC7302
+pac7302         093a:2625       Genius iSlim 310
 pac7302         093a:2626       Labtec 2200
 pac7302         093a:2628       Genius iLook 300
 pac7302         093a:2629       Genious iSlim 300
@@ -283,6 +296,7 @@ sonixb		0c45:602e	Genius VideoCam Messenger
 sonixj          0c45:6040       Speed NVC 350K
 sonixj          0c45:607c       Sonix sn9c102p Hv7131R
 sonixj          0c45:60c0       Sangha Sn535
+sonixj          0c45:60ce       USB-PC-Camera-168 (TALK-5067)
 sonixj          0c45:60ec       SN9C105+MO4000
 sonixj          0c45:60fb       Surfer NoName
 sonixj          0c45:60fc       LG-LIC300
@@ -300,11 +314,14 @@ 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:6142       Hama PC-Webcam AC-150
 sonixj          0c45:6143       Sonix Pccam168
 sonixj          0c45:6148       Digitus DA-70811/ZSMC USB PC Camera ZS211/Microdia
+sonixj          0c45:614a       Frontech E-Ccam (JIL-2225)
 sn9c20x         0c45:6240       PC Camera (SN9C201 + MT9M001)
 sn9c20x         0c45:6242       PC Camera (SN9C201 + MT9M111)
 sn9c20x         0c45:6248       PC Camera (SN9C201 + OV9655)
+sn9c20x         0c45:624c       PC Camera (SN9C201 + MT9M112)
 sn9c20x         0c45:624e       PC Camera (SN9C201 + SOI968)
 sn9c20x         0c45:624f       PC Camera (SN9C201 + OV9650)
 sn9c20x         0c45:6251       PC Camera (SN9C201 + OV9650)
@@ -317,6 +334,7 @@ sn9c20x		0c45:627f	PC Camera (SN9C201 + OV9650)
 sn9c20x         0c45:6280       PC Camera (SN9C202 + MT9M001)
 sn9c20x         0c45:6282       PC Camera (SN9C202 + MT9M111)
 sn9c20x         0c45:6288       PC Camera (SN9C202 + OV9655)
+sn9c20x         0c45:628c       PC Camera (SN9C201 + MT9M112)
 sn9c20x         0c45:628e       PC Camera (SN9C202 + SOI968)
 sn9c20x         0c45:628f       PC Camera (SN9C202 + OV9650)
 sn9c20x         0c45:62a0       PC Camera (SN9C202 + OV7670)
@@ -324,6 +342,10 @@ sn9c20x		0c45:62b0	PC Camera (SN9C202 + MT9V011/MT9V111/MT9V112)
 sn9c20x         0c45:62b3       PC Camera (SN9C202 + OV9655)
 sn9c20x         0c45:62bb       PC Camera (SN9C202 + OV7660)
 sn9c20x         0c45:62bc       PC Camera (SN9C202 + HV7131R)
+sn9c2028        0c45:8001       Wild Planet Digital Spy Camera
+sn9c2028        0c45:8003       Sakar #11199, #6637x, #67480 keychain cams
+sn9c2028        0c45:8008       Mini-Shotz ms-350
+sn9c2028        0c45:800a       Vivitar Vivicam 3350B
 sunplus         0d64:0303       Sunplus FashionCam DXG
 ov519           0e96:c001       TRUST 380 USB2 SPACEC@M
 etoms           102c:6151       Qcam Sangha CIF
@@ -341,10 +363,13 @@ spca501		1776:501c	Arowana 300K CMOS Camera
 t613            17a1:0128       TASCORP JPEG Webcam, NGS Cyclops
 vc032x          17ef:4802       Lenovo Vc0323+MI1310_SOC
 pac207          2001:f115       D-Link DSB-C120
-sq905c          2770:9050       sq905c
-sq905c          2770:905c       DualCamera
-sq905           2770:9120       Argus Digital Camera DC1512
-sq905c          2770:913d       sq905c
+sq905c          2770:9050       Disney pix micro (CIF)
+sq905c          2770:9052       Disney pix micro 2 (VGA)
+sq905c          2770:905c       All 11 known cameras with this ID
+sq905           2770:9120       All 24 known cameras with this ID
+sq905c          2770:913d       All 4 known cameras with this ID
+sq930x          2770:930b       Sweex Motion Tracking / I-Tec iCam Tracer
+sq930x          2770:930c       Trust WB-3500T / NSG Robbie 2.0
 spca500         2899:012c       Toptro Industrial
 ov519           8020:ef04       ov519
 spca508         8086:0110       Intel Easy PC Camera