Linus Torvalds 7fcaa9aaea Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 ... * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (42 commits) [media] media: vb2: correct queue initialization order [media] media: vb2: fix incorrect v4l2_buffer->flags handling [media] s5p-fimc: Add support for the buffer timestamps and sequence [media] s5p-fimc: Fix bytesperline and plane payload setup [media] s5p-fimc: Do not allow changing format after REQBUFS [media] s5p-fimc: Fix FIMC3 pixel limits on Exynos4 [media] tda18271: update tda18271c2_rf_cal as per NXP's rev.04 datasheet [media] tda18271: update tda18271_rf_band as per NXP's rev.04 datasheet [media] tda18271: fix bad calculation of main post divider byte [media] tda18271: prog_cal and prog_tab variables should be s32, not u8 [media] tda18271: fix calculation bug in tda18271_rf_tracking_filters_init [media] omap3isp: queue: Don't corrupt buf->npages when get_user_pages() fails [media] v4l: Don't register media entities for subdev device nodes [media] omap3isp: Don't increment node entity use count when poweron fails [media] omap3isp: lane shifter support [media] omap3isp: ccdc: support Y10/12, 8-bit bayer fmts [media] media: add missing 8-bit bayer formats and Y12 [media] v4l: add V4L2_PIX_FMT_Y12 format cx23885: Fix stv0367 Kconfig dependency [media] omap3isp: Use isp xclk defines ... Fix up trivial conflict (spelink errurs) in drivers/media/video/omap3isp/isp.c		2011-04-27 15:17:52 -07:00
..
.gitignore	V4L/DVB (12915): DocBook/media: Add isdb-t documentation	2009-09-19 00:14:36 -03:00
bayer.pdf	[media] v4l: v4l2_subdev userspace format API - documentation binary files	2011-03-22 04:53:30 -03:00
bayer.png	[media] v4l: v4l2_subdev userspace format API - documentation binary files	2011-03-22 04:53:30 -03:00
biblio.xml
capture.c.xml
common.xml	Fix common misspellings	2011-03-31 11:26:23 -03:00
compat.xml	[media] Make 2.6.39 not 2.6.38 the version when Multi-planar API was added	2011-03-22 04:55:04 -03:00
controls.xml	Fix common misspellings	2011-03-31 11:26:23 -03:00
crop.gif
crop.pdf
dev-capture.xml	[media] Add multi-planar API documentation	2011-03-21 20:31:35 -03:00
dev-codec.xml
dev-effect.xml
dev-event.xml	V4L/DVB: V4L: Events: Add documentation	2010-05-19 12:58:07 -03:00
dev-osd.xml
dev-output.xml	[media] Add multi-planar API documentation	2011-03-21 20:31:35 -03:00
dev-overlay.xml
dev-radio.xml
dev-raw-vbi.xml
dev-rds.xml	[media] DocBook/v4l: fix validation error in dev-rds.xml	2011-01-19 11:46:16 -02:00
dev-sliced-vbi.xml
dev-subdev.xml	Fix common misspellings	2011-03-31 11:26:23 -03:00
dev-teletext.xml	V4L/DVB: Documentation: update now that the vtx/videotext API has been removed	2010-10-21 01:05:48 -02:00
driver.xml
fdl-appendix.xml	Documentation: update broken web addresses.	2010-08-04 15:21:40 +02:00
fieldseq_bt.gif
fieldseq_bt.pdf
fieldseq_tb.gif
fieldseq_tb.pdf
func-close.xml
func-ioctl.xml	[media] Fix videodev.h references at the V4L DocBook	2010-12-29 08:17:12 -02:00
func-mmap.xml	[media] Add multi-planar API documentation	2011-03-21 20:31:35 -03:00
func-munmap.xml	[media] Add multi-planar API documentation	2011-03-21 20:31:35 -03:00
func-open.xml
func-poll.xml
func-read.xml
func-select.xml
func-write.xml
io.xml	[media] Add multi-planar API documentation	2011-03-21 20:31:35 -03:00
keytable.c.xml
libv4l.xml	Fix common misspellings	2011-03-31 11:26:23 -03:00
lirc_device_interface.xml	[media] docs: fix typo in lirc_device_interface.xml	2011-03-22 19:23:46 -03:00
media-controller.xml	[media] media: Links setup	2011-03-22 04:53:16 -03:00
media-func-close.xml	[media] media: Media device information query	2011-03-22 04:53:13 -03:00
media-func-ioctl.xml	[media] media: Media device information query	2011-03-22 04:53:13 -03:00
media-func-open.xml	[media] media: Media device information query	2011-03-22 04:53:13 -03:00
media-ioc-device-info.xml	[media] media: Entities, pads and links enumeration	2011-03-22 04:53:14 -03:00
media-ioc-enum-entities.xml	[media] V4L doc fixes	2011-03-22 04:54:31 -03:00
media-ioc-enum-links.xml	[media] media: Pipelines and media streams	2011-03-22 04:53:17 -03:00
media-ioc-setup-link.xml	[media] media: Use correct ioctl name in MEDIA_IOC_SETUP_LINK documentation	2011-04-13 10:30:12 -03:00
nv12mt_example.gif	[media] v4l: Documentation for the NV12MT format	2011-03-22 04:54:22 -03:00
nv12mt.gif	[media] v4l: Documentation for the NV12MT format	2011-03-22 04:54:22 -03:00
pipeline.pdf	[media] v4l: v4l2_subdev userspace format API - documentation binary files	2011-03-22 04:53:30 -03:00
pipeline.png	[media] v4l: v4l2_subdev userspace format API - documentation binary files	2011-03-22 04:53:30 -03:00
pixfmt-grey.xml
pixfmt-nv12.xml
pixfmt-nv12m.xml	[media] v4l: Add DocBook documentation for YU12M, NV12M image formats	2011-03-21 20:31:35 -03:00
pixfmt-nv12mt.xml	[media] Fix 'ID nv12mt already defined' error	2011-03-22 04:54:34 -03:00
pixfmt-nv16.xml
pixfmt-packed-rgb.xml	V4L/DVB: V4L Doc: removed duplicate link	2010-10-21 01:05:57 -02:00
pixfmt-packed-yuv.xml
pixfmt-sbggr8.xml
pixfmt-sbggr16.xml
pixfmt-sgbrg8.xml
pixfmt-sgrbg8.xml
pixfmt-srggb8.xml	[media] v4l: document new Bayer and monochrome pixel formats	2010-10-23 09:16:08 -02:00
pixfmt-srggb10.xml	[media] v4l: document new Bayer and monochrome pixel formats	2010-10-23 09:16:08 -02:00
pixfmt-srggb12.xml	[media] v4l: Add 12 bits bayer pixel formats	2011-03-22 04:53:38 -03:00
pixfmt-uyvy.xml
pixfmt-vyuy.xml
pixfmt-y10.xml	[media] v4l: document new Bayer and monochrome pixel formats	2010-10-23 09:16:08 -02:00
pixfmt-y12.xml	[media] v4l: add V4L2_PIX_FMT_Y12 format	2011-04-19 11:20:56 -03:00
pixfmt-y16.xml
pixfmt-y41p.xml
pixfmt-yuv410.xml
pixfmt-yuv411p.xml
pixfmt-yuv420.xml
pixfmt-yuv420m.xml	[media] v4l: Add DocBook documentation for YU12M, NV12M image formats	2011-03-21 20:31:35 -03:00
pixfmt-yuv422p.xml
pixfmt-yuyv.xml
pixfmt-yvyu.xml
pixfmt.xml	[media] v4l: add V4L2_PIX_FMT_Y12 format	2011-04-19 11:20:56 -03:00
planar-apis.xml	[media] Remove compatibility layer from multi-planar API documentation	2011-03-21 20:32:05 -03:00
remote_controllers.xml	Fix common misspellings	2011-03-31 11:26:23 -03:00
subdev-formats.xml	[media] media: add missing 8-bit bayer formats and Y12	2011-04-19 11:23:31 -03:00
v4l2.xml	[media] Make 2.6.39 not 2.6.38 the version when Multi-planar API was added	2011-03-22 04:55:04 -03:00
v4l2grab.c.xml
vbi_525.gif
vbi_525.pdf
vbi_625.gif
vbi_625.pdf
vbi_hsync.gif
vbi_hsync.pdf
videodev2.h.xml	[media] videodev2.h.xml: Update to reflect videodev2.h changes	2011-03-21 20:32:38 -03:00
vidioc-cropcap.xml
vidioc-dbg-g-chip-ident.xml
vidioc-dbg-g-register.xml
vidioc-dqevent.xml	V4L/DVB: v4l spec: document new events	2010-05-19 12:58:10 -03:00
vidioc-encoder-cmd.xml
vidioc-enum-dv-presets.xml	V4L/DVB (13572): v4l2-spec: Digital Video Timings API documentation	2009-12-16 00:18:04 -02:00
vidioc-enum-fmt.xml	[media] Add multi-planar API documentation	2011-03-21 20:31:35 -03:00
vidioc-enum-frameintervals.xml
vidioc-enum-framesizes.xml
vidioc-enumaudio.xml
vidioc-enumaudioout.xml
vidioc-enuminput.xml	V4L/DVB: Documentation: fix small error in the ENUMINPUT doc	2010-05-19 12:58:53 -03:00
vidioc-enumoutput.xml	V4L/DVB (13572): v4l2-spec: Digital Video Timings API documentation	2009-12-16 00:18:04 -02:00
vidioc-enumstd.xml
vidioc-g-audio.xml
vidioc-g-audioout.xml
vidioc-g-crop.xml
vidioc-g-ctrl.xml
vidioc-g-dv-preset.xml	V4L/DVB: V4L Doc: fix DocBook syntax errors	2010-10-21 01:05:56 -02:00
vidioc-g-dv-timings.xml	V4L/DVB: V4L Doc: fix DocBook syntax errors	2010-10-21 01:05:56 -02:00
vidioc-g-enc-index.xml
vidioc-g-ext-ctrls.xml
vidioc-g-fbuf.xml	V4L/DVB (13471): v4l2 doc: Added FBUF_CAP_SRC_CHROMAKEY/FLAG_SRC_CHROMAKEY	2009-12-05 18:42:04 -02:00
vidioc-g-fmt.xml	[media] Add multi-planar API documentation	2011-03-21 20:31:35 -03:00
vidioc-g-frequency.xml
vidioc-g-input.xml
vidioc-g-jpegcomp.xml
vidioc-g-modulator.xml
vidioc-g-output.xml
vidioc-g-parm.xml	tree-wide: Assorted spelling fixes	2010-02-09 11:13:56 +01:00
vidioc-g-priority.xml
vidioc-g-sliced-vbi-cap.xml
vidioc-g-std.xml	V4L/DVB (13619): v4l2-spec: Adds EBUSY error code for S_STD and QUERYSTD ioctls	2009-12-16 00:18:47 -02:00
vidioc-g-tuner.xml
vidioc-log-status.xml
vidioc-overlay.xml
vidioc-qbuf.xml	[media] Add multi-planar API documentation	2011-03-21 20:31:35 -03:00
vidioc-query-dv-preset.xml	V4L/DVB: V4L Doc: fix DocBook syntax errors	2010-10-21 01:05:56 -02:00
vidioc-querybuf.xml	[media] Add multi-planar API documentation	2011-03-21 20:31:35 -03:00
vidioc-querycap.xml	[media] Remove compatibility layer from multi-planar API documentation	2011-03-21 20:32:05 -03:00
vidioc-queryctrl.xml	V4L/DVB: V4L Doc: correct the documentation for VIDIOC_QUERYMENU	2010-10-21 01:05:56 -02:00
vidioc-querystd.xml	V4L/DVB (13619): v4l2-spec: Adds EBUSY error code for S_STD and QUERYSTD ioctls	2009-12-16 00:18:47 -02:00
vidioc-reqbufs.xml	V4L/DVB: v4l doc: fix font of field name	2010-05-18 00:47:21 -03:00
vidioc-s-hw-freq-seek.xml	[media] Documentation: v4l: Add hw_seek spacing and two TUNER_RDS_CAP flags	2010-10-22 23:47:03 -02:00
vidioc-streamon.xml	[media] v4l: v4l2_subdev userspace format API	2011-03-22 04:53:31 -03:00
vidioc-subdev-enum-frame-interval.xml	[media] v4l: v4l2_subdev userspace frame interval API	2011-03-22 04:53:32 -03:00
vidioc-subdev-enum-frame-size.xml	[media] v4l: v4l2_subdev userspace format API	2011-03-22 04:53:31 -03:00
vidioc-subdev-enum-mbus-code.xml	[media] v4l: v4l2_subdev userspace format API	2011-03-22 04:53:31 -03:00
vidioc-subdev-g-crop.xml	[media] v4l: v4l2_subdev userspace crop API	2011-03-22 04:53:33 -03:00
vidioc-subdev-g-fmt.xml	[media] v4l: v4l2_subdev userspace format API	2011-03-22 04:53:31 -03:00
vidioc-subdev-g-frame-interval.xml	[media] v4l: v4l2_subdev userspace frame interval API	2011-03-22 04:53:32 -03:00
vidioc-subscribe-event.xml	V4L/DVB: v4l spec: document new events	2010-05-19 12:58:10 -03:00