From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 4 Mar 2007 21:22:12 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
X-Git-Tag: v2.6.21-rc3~100
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85a5d77abea94c3496f63dc3ba72f5f932daa799;p=linux-2.6

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

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

85a5d77abea94c3496f63dc3ba72f5f932daa799