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

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

* 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (87 commits)
  V4L/DVB: ivtv: Timing tweaks and code re-order to try and improve stability
  V4L/DVB: ivtv: Avoid accidental video standard change
  V4L/DVB: ivtvfb : Module load / unload fixes
  V4L/DVB: cx2341x: Report correct temporal setting for log-status
  V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address
  V4L/DVB: drivers/media: Eliminate a NULL pointer dereference
  V4L/DVB: dvb-core: Fix ULE decapsulation bug
  V4L/DVB: Bug fix: make IR work again for dm1105
  V4L/DVB: media/IR: nec-decoder needs to select BITREV
  V4L/DVB: video/saa7134: change dprintk() to i2cdprintk()
  V4L/DVB: video/saa7134: remove duplicate break
  V4L/DVB: IR/imon: add auto-config for 0xffdc rf device
  V4L/DVB: IR/imon: clean up usage of bools
  V4L/DVB: em28xx: remove unneeded null checks
  V4L/DVB: ngene: remove unused #include <linux/version.h>
  V4L/DVB: ak881x needs slab.h
  V4L/DVB: FusionHDTV: Use quick reads for I2C IR device probing
  V4L/DVB: Technotrend S2-3200 ships with a TT 1500 remote
  V4L/DVB: drivers/media: Use kzalloc
  V4L/DVB: m920x: Select simple tuner
  ...
parents d2dd328b 666092c6

Documentation/DocBook/v4l/v4l2.xml

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ MPEG stream embedded, sliced VBI data format in this specification. 
</contrib>

	<affiliation>

	  <address>

	    <email>awalls@radix.net</email>

	    <email>awalls@md.metrocast.net</email>

	  </address>

	</affiliation>

      </author>

Documentation/DocBook/v4l/vidioc-query-dv-preset.xml

+4 −2
Original line number Diff line number Diff line
@@ -53,8 +53,10 @@ input</refpurpose> 
automatically, similar to sensing the video standard. To do so, applications

call <constant> VIDIOC_QUERY_DV_PRESET</constant> with a pointer to a

&v4l2-dv-preset; type. Once the hardware detects a preset, that preset is

returned in the preset field of &v4l2-dv-preset;. When detection is not

possible or fails, the value V4L2_DV_INVALID is returned.</para>

returned in the preset field of &v4l2-dv-preset;. If the preset could not be

detected because there was no signal, or the signal was unreliable, or the

signal did not map to a supported preset, then the value V4L2_DV_INVALID is

returned.</para>

  </refsect1>



  <refsect1>

Documentation/video4linux/CARDLIST.saa7134

+3 −2
Original line number Diff line number Diff line
@@ -176,5 +176,6 @@ 
175 -> Leadtek Winfast DTV1000S                 [107d:6655]

176 -> Beholder BeholdTV 505 RDS                [0000:5051]

177 -> Hawell HW-404M7

179 -> Beholder BeholdTV H7			[5ace:7190]

180 -> Beholder BeholdTV A7			[5ace:7090]
 
178 -> Beholder BeholdTV H7                     [5ace:7190]

179 -> Beholder BeholdTV A7                     [5ace:7090]

180 -> Avermedia M733A                          [1461:4155,1461:4255]

Documentation/video4linux/gspca.txt

+1 −0
Original line number Diff line number Diff line
@@ -290,6 +290,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

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1731,7 +1731,7 @@ S: Maintained 
F:	sound/pci/cs5535audio/



CX18 VIDEO4LINUX DRIVER

M:	Andy Walls <awalls@radix.net>

M:	Andy Walls <awalls@md.metrocast.net>

L:	ivtv-devel@ivtvdriver.org (moderated for non-subscribers)

L:	linux-media@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
@@ -3165,7 +3165,7 @@ F: Documentation/hwmon/it87 
F:	drivers/hwmon/it87.c



IVTV VIDEO4LINUX DRIVER

M:	Andy Walls <awalls@radix.net>

M:	Andy Walls <awalls@md.metrocast.net>

L:	ivtv-devel@ivtvdriver.org (moderated for non-subscribers)

L:	linux-media@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

CRA Git | Maintained and supported by SUSTech CRA and CCSE