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

Browse source

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

...

This commit is contained in:

Linus Torvalds 2007-07-03 13:58:03 -07:00

parent dbc55faa64 1fb4a17f6e

commit f744a0547a

4 changed files with 49 additions and 34 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

66

drivers/media/dvb/cinergyT2/cinergyT2.c

View file

2

drivers/media/dvb/ttpci/budget-core.c

View file

13

drivers/media/video/bt8xx/bttv-driver.c

View file

2

drivers/media/video/cx88/cx88-blackbird.c

View file