9c20591e7b2b04468dd8507
parent 8db72a7d7268630e04ec285fbd3e90733b2eddf9
parent b730011061e2805a46b7291e708b6caaf2be6869
author Linus Torvalds <torvalds@linux-foundation.org> 1304544124 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1304544124 -0700

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:
  [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
p