Commit b043b673 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb 

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (49 commits)
  V4L/DVB (3667b): cpia2: fix function prototype
  V4L/DVB (3702): Make msp3400 routing defines more consistent
  V4L/DVB (3700): Remove obsolete commands from tvp5150.c
  V4L/DVB (3697): More msp3400 and bttv fixes
  V4L/DVB (3696): Previous change for cx2341X boards broke the remote support
  V4L/DVB (3693): Fix msp3400c and bttv stereo/mono/bilingual detection/handling
  V4L/DVB (3692): Keep experimental SLICED_VBI defines under an #if 0
  V4L/DVB (3689): Kconfig: fix VP-3054 Secondary I2C Bus build configuration menu dependencies
  V4L/DVB (3673): Fix budget-av CAM reset
  V4L/DVB (3672): Fix memory leak in dvr open
  V4L/DVB (3671): New module parameter 'tv_standard' (dvb-ttpci driver)
  V4L/DVB (3670): Fix typo in comment
  V4L/DVB (3669): Configurable dma buffer size for saa7146-based budget dvb cards
  V4L/DVB (3653h): Move usb v4l docs into Documentation/video4linux
  V4L/DVB (3667a): Fix SAP + stereo mode at msp3400
  V4L/DVB (3666): Remove trailing newlines
  V4L/DVB (3665): Add new NEC uPD64031A and uPD64083 i2c drivers
  V4L/DVB (3663): Fix msp3400c wait time and better audio mode fallbacks
  V4L/DVB (3662): Don't set msp3400c-non-existent register
  V4L/DVB (3661): Add wm8739 stereo audio ADC i2c driver
  ...
parents cd5e25d9 fb9c280d

Documentation/video4linux/CARDLIST.saa7134

+3 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
 51 -> ProVideo PV952                           [1540:9524]

 52 -> AverMedia AverTV/305                     [1461:2108]

 53 -> ASUS TV-FM 7135                          [1043:4845]

 54 -> LifeView FlyTV Platinum FM               [5168:0214,1489:0214]

 54 -> LifeView FlyTV Platinum FM / Gold        [5168:0214,1489:0214,5168:0304]

 55 -> LifeView FlyDVB-T DUO                    [5168:0306]

 56 -> Avermedia AVerTV 307                     [1461:a70a]

 57 -> Avermedia AVerTV GO 007 FM               [1461:f31f]
@@ -84,7 +84,7 @@ 
 83 -> Terratec Cinergy 250 PCI TV              [153b:1160]

 84 -> LifeView FlyDVB Trio                     [5168:0319]

 85 -> AverTV DVB-T 777                         [1461:2c05]

 86 -> LifeView FlyDVB-T                        [5168:0301]

 86 -> LifeView FlyDVB-T / Genius VideoWonder DVB-T [5168:0301,1489:0301]

 87 -> ADS Instant TV Duo Cardbus PTV331        [0331:1421]

 88 -> Tevion/KWorld DVB-T 220RF                [17de:7201]

 89 -> ELSA EX-VISION 700TV                     [1048:226c]
@@ -92,3 +92,4 @@ 
 91 -> AVerMedia A169 B                         [1461:7360]

 92 -> AVerMedia A169 B1                        [1461:6360]

 93 -> Medion 7134 Bridge #2                    [16be:0005]

 94 -> LifeView FlyDVB-T Hybrid Cardbus         [5168:3306,5168:3502]

Documentation/usb/ibmcam.txt→Documentation/video4linux/ibmcam.txt

+1 −1

File changed and moved.

Contains only whitespace changes.

Documentation/usb/ov511.txt→Documentation/video4linux/ov511.txt

+5 −6
Original line number Diff line number Diff line
@@ -286,4 +286,3 @@ Randy Dunlap, and others. Big thanks to them for their pioneering work on that 
and the USB stack. Thanks to Bret Wallach for getting camera reg IO, ISOC, and

image capture working. Thanks to Orion Sky Lawlor, Kevin Moore, and Claudio

Matsuoka for their work as well.

CRA Git | Maintained and supported by SUSTech CRA and CCSE