tree 7f96764d40111a29688e2b11551b7433889381b9
parent c52042ba5cd2071d9a69972d71997144d236e962
parent 2434466432464110b5307757e0285dd41f15512e
author Linus Torvalds <torvalds@linux-foundation.org> 1266713769 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1266713769 -0800

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:
  V4L/DVB: bttv: Move I2C IR initialization
  V4L/DVB: Video : pwc : Fix regression in pwc_set_shutter_speed caused by bad 	constant => sizeof conversion.
  soc-camera: mt9t112: modify exiting conditions from standby mode
  V4L/DVB: cxusb: Select all required frontend and tuner modules
  V4L/DVB: dvb: l64781.ko broken with gcc 4.5