Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 11 Jan 2008 21:46:46 +0000 (13:46 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 11 Jan 2008 21:46:46 +0000 (13:46 -0800)
commitd0c4c9d4a2e46f052178806c4004d52cd3ae040f
tree648f09c93d8aab711ba9aa9f3cb424462a5b6222
parent460c54b779fce3490ab70a84fd2ef59250ca3d57
parentda517164f5b9133ecc7a020342e90452c215ec0f
Merge git://git./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