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

Commit cf2fa660 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: (313 commits)
  V4L/DVB (9186): Added support for Prof 7300 DVB-S/S2 cards
  V4L/DVB (9185): S2API: Ensure we have a reasonable ROLLOFF default
  V4L/DVB (9184): cx24116: Change the default SNR units back to percentage by default.
  V4L/DVB (9183): S2API: Return error of the caller provides 0 commands.
  V4L/DVB (9182): S2API: Added support for DTV_HIERARCHY
  V4L/DVB (9181): S2API: Add support fot DTV_GUARD_INTERVAL and DTV_TRANSMISSION_MODE
  V4L/DVB (9180): S2API: Added support for DTV_CODE_RATE_HP/LP
  V4L/DVB (9179): S2API: frontend.h cleanup
  V4L/DVB (9178): cx24116: Add module parameter to return SNR as ESNO.
  V4L/DVB (9177): S2API: Change _8PSK / _16APSK to PSK_8 and APSK_16
  V4L/DVB (9176): Add support for DvbWorld USB cards with STV0288 demodulator.
  V4L/DVB (9175): Remove NULL pointer in stb6000 driver.
  V4L/DVB (9174): Allow custom inittab for ST STV0288 demodulator.
  V4L/DVB (9173): S2API: Remove the hardcoded command limit during validation
  V4L/DVB (9172): S2API: Bugfix related to DVB-S / DVB-S2 tuning for the legacy API.
  V4L/DVB (9171): S2API: Stop an OOPS if illegal commands are dumped in S2API.
  V4L/DVB (9170): cx24116: Sanity checking to data input via S2API to the cx24116 demod.
  V4L/DVB (9169): uvcvideo: Support two new Bison Electronics webcams.
  V4L/DVB (9168): Add support for MSI TV@nywhere Plus remote
  V4L/DVB: v4l2-dev: remove duplicated #include
  ...
parents 4501a466 57f51dbc

Documentation/video4linux/CARDLIST.bttv

+1 −0
Original line number Diff line number Diff line
@@ -150,3 +150,4 @@ 
149 -> Typhoon TV-Tuner PCI (50684)

150 -> Geovision GV-600                                    [008a:763c]

151 -> Kozumi KTV-01C

152 -> Encore ENL TV-FM-2                                  [1000:1801]

Documentation/video4linux/CARDLIST.cx23885

+2 −0
Original line number Diff line number Diff line
@@ -9,3 +9,5 @@ 
  8 -> Hauppauge WinTV-HVR1700                             [0070:8101]

  9 -> Hauppauge WinTV-HVR1400                             [0070:8010]

 10 -> DViCO FusionHDTV7 Dual Express                      [18ac:d618]

 11 -> DViCO FusionHDTV DVB-T Dual Express                 [18ac:db78]

 12 -> Leadtek Winfast PxDVR3200 H                         [107d:6681]

Documentation/video4linux/CARDLIST.cx88

+8 −0
Original line number Diff line number Diff line
@@ -66,3 +66,11 @@ 
 65 -> DViCO FusionHDTV 7 Gold                             [18ac:d610]

 66 -> Prolink Pixelview MPEG 8000GT                       [1554:4935]

 67 -> Kworld PlusTV HD PCI 120 (ATSC 120)                 [17de:08c1]

 68 -> Hauppauge WinTV-HVR4000 DVB-S/S2/T/Hybrid           [0070:6900,0070:6904,0070:6902]

 69 -> Hauppauge WinTV-HVR4000(Lite) DVB-S/S2              [0070:6905,0070:6906]

 70 -> TeVii S460 DVB-S/S2                                 [d460:9022]

 71 -> Omicom SS4 DVB-S/S2 PCI                             [A044:2011]

 72 -> TBS 8920 DVB-S/S2                                   [8920:8888]

 73 -> TeVii S420 DVB-S                                    [d420:9022]

 74 -> Prolink Pixelview Global Extreme                    [1554:4976]

 75 -> PROF 7300 DVB-S/S2                                  [B033:3033]

Documentation/video4linux/CARDLIST.em28xx

+2 −2
Original line number Diff line number Diff line 
  0 -> Unknown EM2800 video grabber             (em2800)        [eb1a:2800]

  1 -> Unknown EM2750/28xx video grabber        (em2820/em2840) [eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]

  1 -> Unknown EM2750/28xx video grabber        (em2820/em2840) [eb1a:2820,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]

  2 -> Terratec Cinergy 250 USB                 (em2820/em2840) [0ccd:0036]

  3 -> Pinnacle PCTV USB 2                      (em2820/em2840) [2304:0208]

  4 -> Hauppauge WinTV USB 2                    (em2820/em2840) [2040:4200,2040:4201]
@@ -12,7 +12,7 @@ 
 11 -> Terratec Hybrid XS                       (em2880)        [0ccd:0042]

 12 -> Kworld PVR TV 2800 RF                    (em2820/em2840)

 13 -> Terratec Prodigy XS                      (em2880)        [0ccd:0047]

 14 -> Pixelview Prolink PlayTV USB 2.0         (em2820/em2840)

 14 -> Pixelview Prolink PlayTV USB 2.0         (em2820/em2840) [eb1a:2821]

 15 -> V-Gear PocketTV                          (em2800)

 16 -> Hauppauge WinTV HVR 950                  (em2883)        [2040:6513,2040:6517,2040:651b,2040:651f]

 17 -> Pinnacle PCTV HD Pro Stick               (em2880)        [2304:0227]

Documentation/video4linux/CARDLIST.saa7134

+7 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
 75 -> AVerMedia AVerTVHD MCE A180              [1461:1044]

 76 -> SKNet MonsterTV Mobile                   [1131:4ee9]

 77 -> Pinnacle PCTV 40i/50i/110i (saa7133)     [11bd:002e]

 78 -> ASUSTeK P7131 Dual                       [1043:4862,1043:4857]

 78 -> ASUSTeK P7131 Dual                       [1043:4862]

 79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)

 80 -> ASUS Digimatrix TV                       [1043:0210]

 81 -> Philips Tiger reference design           [1131:2018]
@@ -145,3 +145,9 @@ 
144 -> Beholder BeholdTV M6 Extra               [5ace:6193]

145 -> AVerMedia MiniPCI DVB-T Hybrid M103      [1461:f636]

146 -> ASUSTeK P7131 Analog

147 -> Asus Tiger 3in1                          [1043:4878]

148 -> Encore ENLTV-FM v5.3                     [1a7f:2008]

149 -> Avermedia PCI pure analog (M135A)        [1461:f11d]

150 -> Zogis Real Angel 220

151 -> ADS Tech Instant HDTV                    [1421:0380]

152 -> Asus Tiger Rev:1.00                      [1043:4857]