Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

Browse source

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (5260): Cx88-blackbird: allow usage of both 376836 and 262144 sized firmware images
  V4L/DVB (5366): Pvrusb2: Fix compilation warning for amd64 builds (use %zu instead of %u)

...

This commit is contained in:

Linus Torvalds 2007-03-04 13:22:12 -08:00

parent 6d04e3b04b af70dbd334

commit 85a5d77abe

3 changed files with 11 additions and 6 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

14

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

View file

1

drivers/media/video/cx88/cx88.h

View file

2

drivers/media/video/pvrusb2/pvrusb2-hdw.c

View file