linux/drivers/media/dvb
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
..
b2c2 net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
bt8xx [media] dvb-bt8xx: Don't return -EFAULT when a device is not found 2011-07-27 17:53:37 -03:00
ddbridge [media] drxk: Move I2C address into a config structure 2011-07-27 17:55:48 -03:00
dm1105 net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
dvb-core Revert "[media] DVB: dvb_frontend: off by one in dtv_property_dump()" 2011-07-27 17:56:02 -03:00
dvb-usb [media] af9015: add support for Sveon STV22 [1b80:e401] 2011-07-27 17:55:58 -03:00
firewire [media] firedtv: change some -EFAULT returns to more fitting error codes 2011-07-27 17:53:38 -03:00
frontends [media] tda18271c2dd: Fix saw filter configuration for DVB-C @6MHz 2011-07-28 17:09:46 -03:00
mantis net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
ngene [media] drxk: Move I2C address into a config structure 2011-07-27 17:55:48 -03:00
pluto2 net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
pt1 [media] Fix panic on loading earth-pt1 2011-05-20 09:29:33 -03:00
siano [media] siano: bad parameter is -EINVAL and not -EFAULT 2011-07-27 17:53:36 -03:00
ttpci [media] budget-ci: Add support for TT S-1500 with BSBE1-D01A tuner 2011-05-20 09:28:30 -03:00
ttusb-budget [media] ttusb-budget: driver has a debug param, use it 2011-05-20 09:27:38 -03:00
ttusb-dec Fix common misspellings 2011-03-31 11:26:23 -03:00
Kconfig [media] ddbridge: Allow compiling of the driver 2011-07-27 17:55:45 -03:00
Makefile [media] ddbridge: Allow compiling of the driver 2011-07-27 17:55:45 -03:00