diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 00:08:53 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 00:08:53 -0700 |
commit | 664a41b8a91bf78a01a751e15175e0008977685a (patch) | |
tree | d9dc15c83400ad2dfb430ff27ae3e7fdc9395856 | |
parent | 983236b5741e557451f3ed4ec5ebf1f62a5b2c15 (diff) | |
parent | ee2ce3a0b43d14d792d34cf88e7bc2091096744b (diff) |
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: (430 commits)
[media] ir-mce_kbd-decoder: include module.h for its facilities
[media] ov5642: include module.h for its facilities
[media] em28xx: Fix DVB-C maxsize for em2884
[media] tda18271c2dd: Fix saw filter configuration for DVB-C @6MHz
[media] v4l: mt9v032: Fix Bayer pattern
[media] V4L: mt9m111: rewrite set_pixfmt
[media] V4L: mt9m111: fix missing return value check mt9m111_reg_clear
[media] V4L: initial driver for ov5642 CMOS sensor
[media] V4L: sh_mobile_ceu_camera: fix Oops when USERPTR mapping fails
[media] V4L: soc-camera: remove soc-camera bus and devices on it
[media] V4L: soc-camera: un-export the soc-camera bus
[media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier
[media] V4L: add media bus configuration subdev operations
[media] V4L: soc-camera: group struct field initialisations together
[media] V4L: soc-camera: remove now unused soc-camera specific PM hooks
[media] V4L: pxa-camera: switch to using standard PM hooks
[media] NetUP Dual DVB-T/C CI RF: force card hardware revision by module param
[media] Don't OOPS if videobuf_dvb_get_frontend return NULL
[media] NetUP Dual DVB-T/C CI RF: load firmware according card revision
[media] omap3isp: Support configurable HS/VS polarities
...
Fix up conflicts:
- arch/arm/mach-omap2/board-rx51-peripherals.c:
cleanup regulator supply definitions in mach-omap2
vs
OMAP3: RX-51: define vdds_csib regulator supply
- drivers/staging/tm6000/tm6000-alsa.c (trivial)
-rw-r--r-- | Documentation/DocBook/.gitignore | 5 | ||||
-rw-r--r-- | Documentation/DocBook/Makefile | 31 | ||||
-rw-r--r-- | Documentation/DocBook/dvb/dvbproperty.xml | 590 | ||||
-rw-r--r-- | Documentation/DocBook/dvb/dvbstb.png | bin | 22655 -> 0 bytes | |||
-rw-r--r-- | Documentation/DocBook/dvb/frontend.h.xml | 428 | ||||
-rw-r--r-- | Documentation/DocBook/media-entities.tmpl | 464 | ||||
-rw-r--r-- | Documentation/DocBook/media-indices.tmpl | 89 | ||||
-rw-r--r-- | Documentation/DocBook/media/Makefile | 386 | ||||
-rw-r--r-- | Documentation/DocBook/media/bayer.png.b64 | 171 | ||||
-rw-r--r-- | Documentation/DocBook/media/crop.gif.b64 | 105 | ||||
-rw-r--r-- | Documentation/DocBook/media/dvb/.gitignore (renamed from Documentation/DocBook/dvb/.gitignore) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/dvb/audio.xml (renamed from Documentation/DocBook/dvb/audio.xml) | 488 | ||||
-rw-r--r-- | Documentation/DocBook/media/dvb/ca.xml (renamed from Documentation/DocBook/dvb/ca.xml) | 112 | ||||
-rw-r--r-- | Documentation/DocBook/media/dvb/demux.xml (renamed from Documentation/DocBook/dvb/demux.xml) | 327 | ||||
-rw-r--r-- | Documentation/DocBook/media/dvb/dvbapi.xml (renamed from Documentation/DocBook/dvb/dvbapi.xml) | 20 | ||||
-rw-r--r-- | Documentation/DocBook/media/dvb/dvbproperty.xml | 859 | ||||
-rw-r--r-- | Documentation/DocBook/media/dvb/dvbstb.pdf (renamed from Documentation/DocBook/dvb/dvbstb.pdf) | bin | 1881 -> 1881 bytes | |||
-rw-r--r-- | Documentation/DocBook/media/dvb/examples.xml (renamed from Documentation/DocBook/dvb/examples.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/dvb/frontend.xml (renamed from Documentation/DocBook/dvb/frontend.xml) | 776 | ||||
-rw-r--r-- | Documentation/DocBook/media/dvb/intro.xml (renamed from Documentation/DocBook/dvb/intro.xml) | 23 | ||||
-rw-r--r-- | Documentation/DocBook/media/dvb/kdapi.xml (renamed from Documentation/DocBook/dvb/kdapi.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/dvb/net.xml (renamed from Documentation/DocBook/dvb/net.xml) | 17 | ||||
-rw-r--r-- | Documentation/DocBook/media/dvb/video.xml (renamed from Documentation/DocBook/dvb/video.xml) | 638 | ||||
-rw-r--r-- | Documentation/DocBook/media/dvbstb.png.b64 | 398 | ||||
-rw-r--r-- | Documentation/DocBook/media/fieldseq_bt.gif.b64 | 447 | ||||
-rw-r--r-- | Documentation/DocBook/media/fieldseq_tb.gif.b64 | 445 | ||||
-rw-r--r-- | Documentation/DocBook/media/nv12mt.gif.b64 | 37 | ||||
-rw-r--r-- | Documentation/DocBook/media/nv12mt_example.gif.b64 | 121 | ||||
-rw-r--r-- | Documentation/DocBook/media/pipeline.png.b64 | 213 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/.gitignore (renamed from Documentation/DocBook/v4l/.gitignore) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/biblio.xml (renamed from Documentation/DocBook/v4l/biblio.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/capture.c.xml (renamed from Documentation/DocBook/v4l/capture.c.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/common.xml (renamed from Documentation/DocBook/v4l/common.xml) | 10 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/compat.xml (renamed from Documentation/DocBook/v4l/compat.xml) | 30 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/controls.xml (renamed from Documentation/DocBook/v4l/controls.xml) | 1267 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/crop.pdf (renamed from Documentation/DocBook/v4l/crop.pdf) | bin | 5846 -> 5846 bytes | |||
-rw-r--r-- | Documentation/DocBook/media/v4l/dev-capture.xml (renamed from Documentation/DocBook/v4l/dev-capture.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/dev-codec.xml (renamed from Documentation/DocBook/v4l/dev-codec.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/dev-effect.xml (renamed from Documentation/DocBook/v4l/dev-effect.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/dev-event.xml | 51 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/dev-osd.xml (renamed from Documentation/DocBook/v4l/dev-osd.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/dev-output.xml (renamed from Documentation/DocBook/v4l/dev-output.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/dev-overlay.xml (renamed from Documentation/DocBook/v4l/dev-overlay.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/dev-radio.xml (renamed from Documentation/DocBook/v4l/dev-radio.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/dev-raw-vbi.xml (renamed from Documentation/DocBook/v4l/dev-raw-vbi.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/dev-rds.xml (renamed from Documentation/DocBook/v4l/dev-rds.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/dev-sliced-vbi.xml (renamed from Documentation/DocBook/v4l/dev-sliced-vbi.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/dev-subdev.xml (renamed from Documentation/DocBook/v4l/dev-subdev.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/dev-teletext.xml (renamed from Documentation/DocBook/v4l/dev-teletext.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/driver.xml (renamed from Documentation/DocBook/v4l/driver.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/fdl-appendix.xml (renamed from Documentation/DocBook/v4l/fdl-appendix.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/fieldseq_bt.pdf (renamed from Documentation/DocBook/v4l/fieldseq_bt.pdf) | bin | 9185 -> 9185 bytes | |||
-rw-r--r-- | Documentation/DocBook/media/v4l/fieldseq_tb.pdf (renamed from Documentation/DocBook/v4l/fieldseq_tb.pdf) | bin | 9173 -> 9173 bytes | |||
-rw-r--r-- | Documentation/DocBook/media/v4l/func-close.xml (renamed from Documentation/DocBook/v4l/func-close.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/func-ioctl.xml | 79 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/func-mmap.xml (renamed from Documentation/DocBook/v4l/func-mmap.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/func-munmap.xml (renamed from Documentation/DocBook/v4l/func-munmap.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/func-open.xml (renamed from Documentation/DocBook/v4l/func-open.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/func-poll.xml (renamed from Documentation/DocBook/v4l/func-poll.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/func-read.xml (renamed from Documentation/DocBook/v4l/func-read.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/func-select.xml (renamed from Documentation/DocBook/v4l/func-select.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/func-write.xml (renamed from Documentation/DocBook/v4l/func-write.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/gen-errors.xml | 78 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/io.xml (renamed from Documentation/DocBook/v4l/io.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/keytable.c.xml (renamed from Documentation/DocBook/v4l/keytable.c.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/libv4l.xml (renamed from Documentation/DocBook/v4l/libv4l.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/lirc_device_interface.xml (renamed from Documentation/DocBook/v4l/lirc_device_interface.xml) | 4 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/media-controller.xml (renamed from Documentation/DocBook/v4l/media-controller.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/media-func-close.xml (renamed from Documentation/DocBook/v4l/media-func-close.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/media-func-ioctl.xml (renamed from Documentation/DocBook/v4l/media-func-ioctl.xml) | 47 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/media-func-open.xml (renamed from Documentation/DocBook/v4l/media-func-open.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/media-ioc-device-info.xml (renamed from Documentation/DocBook/v4l/media-ioc-device-info.xml) | 3 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml (renamed from Documentation/DocBook/v4l/media-ioc-enum-entities.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/media-ioc-enum-links.xml (renamed from Documentation/DocBook/v4l/media-ioc-enum-links.xml) | 2 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/media-ioc-setup-link.xml (renamed from Documentation/DocBook/v4l/media-ioc-setup-link.xml) | 9 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pipeline.pdf (renamed from Documentation/DocBook/v4l/pipeline.pdf) | bin | 20276 -> 20276 bytes | |||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-grey.xml (renamed from Documentation/DocBook/v4l/pixfmt-grey.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-m420.xml (renamed from Documentation/DocBook/v4l/pixfmt-m420.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-nv12.xml (renamed from Documentation/DocBook/v4l/pixfmt-nv12.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-nv12m.xml (renamed from Documentation/DocBook/v4l/pixfmt-nv12m.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml (renamed from Documentation/DocBook/v4l/pixfmt-nv12mt.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-nv16.xml (renamed from Documentation/DocBook/v4l/pixfmt-nv16.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml (renamed from Documentation/DocBook/v4l/pixfmt-packed-rgb.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-packed-yuv.xml (renamed from Documentation/DocBook/v4l/pixfmt-packed-yuv.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-sbggr16.xml (renamed from Documentation/DocBook/v4l/pixfmt-sbggr16.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-sbggr8.xml (renamed from Documentation/DocBook/v4l/pixfmt-sbggr8.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-sgbrg8.xml (renamed from Documentation/DocBook/v4l/pixfmt-sgbrg8.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-sgrbg8.xml (renamed from Documentation/DocBook/v4l/pixfmt-sgrbg8.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-srggb10.xml (renamed from Documentation/DocBook/v4l/pixfmt-srggb10.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-srggb12.xml (renamed from Documentation/DocBook/v4l/pixfmt-srggb12.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-srggb8.xml (renamed from Documentation/DocBook/v4l/pixfmt-srggb8.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-uyvy.xml (renamed from Documentation/DocBook/v4l/pixfmt-uyvy.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-vyuy.xml (renamed from Documentation/DocBook/v4l/pixfmt-vyuy.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-y10.xml (renamed from Documentation/DocBook/v4l/pixfmt-y10.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-y10b.xml (renamed from Documentation/DocBook/v4l/pixfmt-y10b.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-y12.xml (renamed from Documentation/DocBook/v4l/pixfmt-y12.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-y16.xml (renamed from Documentation/DocBook/v4l/pixfmt-y16.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-y41p.xml (renamed from Documentation/DocBook/v4l/pixfmt-y41p.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-yuv410.xml (renamed from Documentation/DocBook/v4l/pixfmt-yuv410.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-yuv411p.xml (renamed from Documentation/DocBook/v4l/pixfmt-yuv411p.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-yuv420.xml (renamed from Documentation/DocBook/v4l/pixfmt-yuv420.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml (renamed from Documentation/DocBook/v4l/pixfmt-yuv420m.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-yuv422p.xml (renamed from Documentation/DocBook/v4l/pixfmt-yuv422p.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-yuyv.xml (renamed from Documentation/DocBook/v4l/pixfmt-yuyv.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt-yvyu.xml (renamed from Documentation/DocBook/v4l/pixfmt-yvyu.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt.xml (renamed from Documentation/DocBook/v4l/pixfmt.xml) | 60 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/planar-apis.xml (renamed from Documentation/DocBook/v4l/planar-apis.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/remote_controllers.xml (renamed from Documentation/DocBook/v4l/remote_controllers.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/subdev-formats.xml (renamed from Documentation/DocBook/v4l/subdev-formats.xml) | 5 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/v4l2.xml (renamed from Documentation/DocBook/v4l/v4l2.xml) | 13 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/v4l2grab.c.xml (renamed from Documentation/DocBook/v4l/v4l2grab.c.xml) | 0 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/vbi_525.pdf (renamed from Documentation/DocBook/v4l/vbi_525.pdf) | bin | 3395 -> 3395 bytes | |||
-rw-r--r-- | Documentation/DocBook/media/v4l/vbi_625.pdf (renamed from Documentation/DocBook/v4l/vbi_625.pdf) | bin | 3683 -> 3683 bytes | |||
-rw-r--r-- | Documentation/DocBook/media/v4l/vbi_hsync.pdf (renamed from Documentation/DocBook/v4l/vbi_hsync.pdf) | bin | 7405 -> 7405 bytes | |||
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-cropcap.xml (renamed from Documentation/DocBook/v4l/vidioc-cropcap.xml) | 13 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml (renamed from Documentation/DocBook/v4l/vidioc-dbg-g-chip-ident.xml) | 11 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-dbg-g-register.xml (renamed from Documentation/DocBook/v4l/vidioc-dbg-g-register.xml) | 17 | ||||
-rw-r--r-- |