Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 May 2011 21:22:04 +0000 (14:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 May 2011 21:22:04 +0000 (14:22 -0700)
commit1c08232cfe5e68c6234305a3abb64d52d89c9ead
treeffba8b76685d26e719c20591e7b2b04468dd8507
parent8db72a7d7268630e04ec285fbd3e90733b2eddf9
parentb730011061e2805a46b7291e708b6caaf2be6869
Merge branch 'v4l_for_linus' of git://git./linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  [media] ngene: Fix CI data transfer regression Fix CI data transfer regression introduced by previous cleanup.
  [media] v4l: make sure drivers supply a zeroed struct v4l2_subdev
  [media] Missing frontend config for LME DM04/QQBOX
  [media] rc_core: avoid kernel oops when rmmod saa7134
  [media] imon: add conditional locking in change_protocol
  [media] rc: show RC_TYPE_OTHER in sysfs
  [media] ite-cir: modular build on ppc requires delay.h include
  [media] mceusb: add Dell transceiver ID
drivers/media/dvb/ngene/ngene-core.c
drivers/media/rc/imon.c
drivers/media/rc/ite-cir.c
drivers/media/rc/rc-main.c