aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/zoran_card.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-15 10:05:10 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-15 10:05:10 -0800
commitfc03da1ca1954f103ed57daf90611cefa57b07e0 (patch)
tree2b9b44b1a39f7743c1c3d7bc89654792686d7dbc /drivers/media/video/zoran_card.c
parentx86: Work around compiler code generation bug with -Os (diff)
parentpowerpc/32: Restore previous version of 32-bit PCI code (diff)
downloadlinux-dev-fc03da1ca1954f103ed57daf90611cefa57b07e0.tar.xz
linux-dev-fc03da1ca1954f103ed57daf90611cefa57b07e0.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'drivers/media/video/zoran_card.c')
0 files changed, 0 insertions, 0 deletions