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)
No related branches found
No related tags found
Showing
- Documentation/DocBook/.gitignore 4 additions, 1 deletionDocumentation/DocBook/.gitignore
- Documentation/DocBook/Makefile 10 additions, 21 deletionsDocumentation/DocBook/Makefile
- Documentation/DocBook/dvb/dvbproperty.xml 0 additions, 590 deletionsDocumentation/DocBook/dvb/dvbproperty.xml
- Documentation/DocBook/dvb/dvbstb.png 0 additions, 0 deletionsDocumentation/DocBook/dvb/dvbstb.png
- Documentation/DocBook/dvb/frontend.h.xml 0 additions, 428 deletionsDocumentation/DocBook/dvb/frontend.h.xml
- Documentation/DocBook/media-entities.tmpl 0 additions, 464 deletionsDocumentation/DocBook/media-entities.tmpl
- Documentation/DocBook/media-indices.tmpl 0 additions, 89 deletionsDocumentation/DocBook/media-indices.tmpl
- Documentation/DocBook/media/Makefile 386 additions, 0 deletionsDocumentation/DocBook/media/Makefile
- Documentation/DocBook/media/bayer.png.b64 171 additions, 0 deletionsDocumentation/DocBook/media/bayer.png.b64
- Documentation/DocBook/media/crop.gif.b64 105 additions, 0 deletionsDocumentation/DocBook/media/crop.gif.b64
- Documentation/DocBook/media/dvb/.gitignore 0 additions, 0 deletionsDocumentation/DocBook/media/dvb/.gitignore
- Documentation/DocBook/media/dvb/audio.xml 109 additions, 379 deletionsDocumentation/DocBook/media/dvb/audio.xml
- Documentation/DocBook/media/dvb/ca.xml 60 additions, 52 deletionsDocumentation/DocBook/media/dvb/ca.xml
- Documentation/DocBook/media/dvb/demux.xml 128 additions, 199 deletionsDocumentation/DocBook/media/dvb/demux.xml
- Documentation/DocBook/media/dvb/dvbapi.xml 20 additions, 0 deletionsDocumentation/DocBook/media/dvb/dvbapi.xml
- Documentation/DocBook/media/dvb/dvbproperty.xml 859 additions, 0 deletionsDocumentation/DocBook/media/dvb/dvbproperty.xml
- Documentation/DocBook/media/dvb/dvbstb.pdf 0 additions, 0 deletionsDocumentation/DocBook/media/dvb/dvbstb.pdf
- Documentation/DocBook/media/dvb/examples.xml 0 additions, 0 deletionsDocumentation/DocBook/media/dvb/examples.xml
- Documentation/DocBook/media/dvb/frontend.xml 220 additions, 556 deletionsDocumentation/DocBook/media/dvb/frontend.xml
- Documentation/DocBook/media/dvb/intro.xml 22 additions, 1 deletionDocumentation/DocBook/media/dvb/intro.xml
Loading
Please register or sign in to comment