tree 3cb012538b28eca465226f9164b0a4ebe281afa4
parent b5748643332bf75274e0b639926d57e86fb133cf
parent 70cd685d4b161c9137020ba7ec551cb343cd6fbf
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1187675304 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1187675304 -0700

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (6028): Turn an unnecessary mdelay() into msleep().
  V4L/DVB (6027): Get rid of an ill-behaved msleep in i2c write
  V4L/DVB (6026): Avoid powering up the camera on resume
  V4L/DVB (6016): get_dvb_firmware: update script for new location of tda10046 firmware
  V4L/DVB (5991): dvb-pll: Set minimum and maximum frequency properly
  V4L/DVB (5969): ivtv: report ivtv version in status log
  V4L/DVB (5967): ivtv: fix VIDIOC_S_FBUF:new OSD values where never set
  V4L/DVB (5968): videodev2.h: remove superfluous FBUF GLOBAL_INV_ALPHA support