Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
[linux-2.6] / drivers / video / logo / clut_vga16.ppm
drivers/video/logo/clut_vga16.ppm