]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
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)
commit85a5d77abea94c3496f63dc3ba72f5f932daa799
tree01d94b7630d770769d595b9c5d729d62a151c917
parent6d04e3b04b6ab569cabeb5ca28ad1be11777e895
parentaf70dbd3346999570db73b3bc3d4f7b7c004f2ea
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)