From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 3 Jul 2007 20:58:03 +0000 (-0700)
Subject: Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v2.6.22~34
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f744a0547ac5055a3e9eb20bfe7ff29077a32c16;p=~shefty%2Frdma-dev.git

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

* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (5822): Fix the return value in ttpci_budget_init()
  V4L/DVB (5818): CinergyT2: fix flush_workqueue() vs work->func() deadlock
  V4L/DVB (5816): Cx88-blackbird: fix vidioc_g_tuner never ending list of tuners
  V4L/DVB (5808): Bttv: fix v4l1 breaking the driver
---

f744a0547ac5055a3e9eb20bfe7ff29077a32c16