From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 11 Jan 2008 21:46:46 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
X-Git-Tag: v2.6.24-rc8~40
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d0c4c9d4a2e46f052178806c4004d52cd3ae040f;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 (7001): av7110: fix section mismatch
  V4L/DVB (6999): ivtv: stick to udelay=10 after all
---

d0c4c9d4a2e46f052178806c4004d52cd3ae040f