Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 043fe50f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (213 commits)
  V4L/DVB (12720): em28xx-cards: Add vendor/product id for Kworld DVD Maker 2
  V4L/DVB (12713): em28xx: Cleanups at ir_i2c handler
  V4L/DVB (12712): em28xx: properly load ir-kbd-i2c when needed
  V4L/DVB (12701): saa7134: ir-kbd-i2c init data needs a persistent object
  V4L/DVB (12699): cx18: ir-kbd-i2c initialization data should point to a persistent object
  V4L/DVB (12698): em28xx: ir-kbd-i2c init data needs a persistent object
  V4L/DVB (12707): gspca - sn9c20x: Add SXGA support to MT9M111
  V4L/DVB (12706): gspca - sn9c20x: disable exposure/gain controls for MT9M111 sensors.
  V4L/DVB (12705): gspca - sn9c20x: Add SXGA support to SOI968
  V4L/DVB (12703): gspca - sn9c20x: Reduces size of object
  V4L/DVB (12704): gspca - sn9c20x: Fix exposure on SOI968 sensors
  V4L/DVB (12696): gspca - sonixj / sn9c102: Two drivers for 0c45:60fc and 0c45:613e.
  V4L/DVB (12695): gspca - vc032x: Do the LED work with the sensor hv7131r.
  V4L/DVB (12694): gspca - vc032x: Change the start exchanges of the sensor hv7131r.
  V4L/DVB (12693): gspca - sunplus: The brightness is signed.
  V4L/DVB (12692): gspca - sunplus: Optimize code.
  V4L/DVB (12691): gspca - sonixj: Don't use mdelay().
  V4L/DVB (12690): gspca - pac7311: Webcam 06f8:3009 added.
  V4L/DVB (12686): dvb-core: check supported QAM modulations
  V4L/DVB (12685): dvb-core: check fe->ops.set_frontend return value
  ...
parents 22742390 ea47689e

Documentation/video4linux/CARDLIST.cx23885

+2 −0
Original line number Diff line number Diff line
@@ -21,3 +21,5 @@ 
 20 -> Hauppauge WinTV-HVR1255                             [0070:2251]

 21 -> Hauppauge WinTV-HVR1210                             [0070:2291,0070:2295]

 22 -> Mygica X8506 DMB-TH                                 [14f1:8651]

 23 -> Magic-Pro ProHDTV Extreme 2                         [14f1:8657]

 24 -> Hauppauge WinTV-HVR1850                             [0070:8541]

Documentation/video4linux/CARDLIST.cx88

+1 −0
Original line number Diff line number Diff line
@@ -80,3 +80,4 @@ 
 79 -> Terratec Cinergy HT PCI MKII                        [153b:1177]

 80 -> Hauppauge WinTV-IR Only                             [0070:9290]

 81 -> Leadtek WinFast DTV1800 Hybrid                      [107d:6654]

 82 -> WinFast DTV2000 H rev. J                            [107d:6f2b]

Documentation/video4linux/CARDLIST.em28xx

+3 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
  6 -> Terratec Cinergy 200 USB                 (em2800)

  7 -> Leadtek Winfast USB II                   (em2800)        [0413:6023]

  8 -> Kworld USB2800                           (em2800)

  9 -> Pinnacle Dazzle DVC 90/100/101/107 / Kaiser Baas Video to DVD maker (em2820/em2840) [1b80:e302,2304:0207,2304:021a]

  9 -> Pinnacle Dazzle DVC 90/100/101/107 / Kaiser Baas Video to DVD maker  (em2820/em2840) [1b80:e302,1b80:e304,2304:0207,2304:021a]

 10 -> Hauppauge WinTV HVR 900                  (em2880)        [2040:6500]

 11 -> Terratec Hybrid XS                       (em2880)        [0ccd:0042]

 12 -> Kworld PVR TV 2800 RF                    (em2820/em2840)
@@ -33,7 +33,7 @@ 
 34 -> Terratec Cinergy A Hybrid XS             (em2860)        [0ccd:004f]

 35 -> Typhoon DVD Maker                        (em2860)

 36 -> NetGMBH Cam                              (em2860)

 37 -> Gadmei UTV330                            (em2860)

 37 -> Gadmei UTV330                            (em2860)        [eb1a:50a6]

 38 -> Yakumo MovieMixer                        (em2861)

 39 -> KWorld PVRTV 300U                        (em2861)        [eb1a:e300]

 40 -> Plextor ConvertX PX-TV100U               (em2861)        [093b:a005]
@@ -67,3 +67,4 @@ 
 69 -> KWorld ATSC 315U HDTV TV Box             (em2882)        [eb1a:a313]

 70 -> Evga inDtube                             (em2882)

 71 -> Silvercrest Webcam 1.3mpix               (em2820/em2840)

 72 -> Gadmei UTV330+                           (em2861)

Documentation/video4linux/CARDLIST.saa7134

+4 −0
Original line number Diff line number Diff line
@@ -167,3 +167,7 @@ 
166 -> Beholder BeholdTV 607 RDS                [5ace:6073]

167 -> Beholder BeholdTV 609 RDS                [5ace:6092]

168 -> Beholder BeholdTV 609 RDS                [5ace:6093]

169 -> Compro VideoMate S350/S300               [185b:c900]

170 -> AverMedia AverTV Studio 505              [1461:a115]

171 -> Beholder BeholdTV X7                     [5ace:7595]

172 -> RoverMedia TV Link Pro FM                [19d1:0138]

Documentation/video4linux/CARDLIST.tuner

+1 −0
Original line number Diff line number Diff line
@@ -78,3 +78,4 @@ tuner=77 - TCL tuner MF02GIP-5N-E 
tuner=78 - Philips FMD1216MEX MK3 Hybrid Tuner

tuner=79 - Philips PAL/SECAM multi (FM1216 MK5)

tuner=80 - Philips FQ1216LME MK3 PAL/SECAM w/active loopthrough

tuner=81 - Partsnic (Daewoo) PTI-5NF05