diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-04 13:22:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-04 13:22:12 -0800 |
| commit | 85a5d77abea94c3496f63dc3ba72f5f932daa799 (patch) | |
| tree | 01d94b7630d770769d595b9c5d729d62a151c917 /drivers/ide/ppc | |
| parent | 6d04e3b04b6ab569cabeb5ca28ad1be11777e895 (diff) | |
| parent | af70dbd3346999570db73b3bc3d4f7b7c004f2ea (diff) | |
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)
Diffstat (limited to 'drivers/ide/ppc')
0 files changed, 0 insertions, 0 deletions