linux/drivers/media/video/davinci
Linus Torvalds 664a41b8a9 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)
2011-07-30 00:08:53 -07:00
..
Kconfig [media] davinci vpbe: Build infrastructure for VPBE driver 2011-07-27 17:53:10 -03:00
Makefile [media] davinci vpbe: Build infrastructure for VPBE driver 2011-07-27 17:53:10 -03:00
ccdc_hw_device.h V4L/DVB (12249): v4l: ccdc hw device header file for vpfe capture 2009-09-19 00:18:13 -03:00
dm355_ccdc.c V4L/DVB: vpfe-capture - converting dm355 ccdc driver to a platform driver 2010-02-26 15:10:45 -03:00
dm355_ccdc_regs.h V4L/DVB (12250): v4l: dm355 ccdc module for vpfe capture driver 2009-09-19 00:18:15 -03:00
dm644x_ccdc.c Fix common misspellings 2011-03-31 11:26:23 -03:00
dm644x_ccdc_regs.h V4L/DVB: V4L: dm644x_ccdc: Add Suspend/Resume Support 2010-05-18 00:52:45 -03:00
isif.c V4L/DVB: V4L - vpfe capture - source for ISIF driver on DM365 2010-02-26 15:11:06 -03:00
isif_regs.h V4L/DVB: Fix bad whitespacing 2010-05-18 00:47:01 -03:00
vpbe.c [media] davinci vpbe: VPBE display driver 2011-07-27 17:53:09 -03:00
vpbe_display.c [media] davinci vpbe: V4L2 display driver for DM644X SoC 2011-07-27 17:53:09 -03:00
vpbe_osd.c [media] davinci vpbe: OSD(On Screen Display) block 2011-07-27 17:53:10 -03:00
vpbe_osd_regs.h [media] davinci vpbe: OSD(On Screen Display) block 2011-07-27 17:53:10 -03:00
vpbe_venc.c [media] davinci vpbe: VENC( Video Encoder) implementation 2011-07-27 17:53:10 -03:00
vpbe_venc_regs.h [media] davinci vpbe: VENC( Video Encoder) implementation 2011-07-27 17:53:10 -03:00
vpfe_capture.c Fix common misspellings 2011-03-31 11:26:23 -03:00
vpif.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
vpif.h [media] vpif_cap/disp: Cleanup, improved comments 2011-01-19 11:28:19 -02:00
vpif_capture.c [media] Stop using linux/version.h on the remaining video drivers 2011-07-27 17:53:16 -03:00
vpif_capture.h [media] Stop using linux/version.h on the remaining video drivers 2011-07-27 17:53:16 -03:00
vpif_display.c [media] Stop using linux/version.h on the remaining video drivers 2011-07-27 17:53:16 -03:00
vpif_display.h [media] Stop using linux/version.h on the remaining video drivers 2011-07-27 17:53:16 -03:00
vpss.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00