tree a68d7403a072a2667183af0a5132466accb0eae1
parent dbc55faa64c12f4c9fab6e2bd131d771bc026ed1
parent 1fb4a17f6e47d86b25bfc4fd9df4301bca09c999
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1183496283 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1183496283 -0700

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