From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 7 Jan 2008 21:29:39 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
X-Git-Tag: v2.6.24-rc8~75
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=89a30a8388c9592579f237bc06988808f2c454d4;p=~emulex%2Finfiniband.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* 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
---

89a30a8388c9592579f237bc06988808f2c454d4