]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d04e3b af70dbd)
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 4 Mar 2007 21:22:12 +0000 (13:22 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 4 Mar 2007 21:22:12 +0000 (13:22 -0800)
* 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)


Trivial merge
Linux 2.6 source tree