Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 7 Jan 2008 21:29:39 +0000 (13:29 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 7 Jan 2008 21:29:39 +0000 (13:29 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (6916): ivtv: udelay has to be changed *after* the eeprom was read, not before
  V4L/DVB (6944a): Fix Regression VIDIOCGMBUF ioctl hangs on bttv driver


Trivial merge