Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux
[linux-2.6] / drivers / video / logo / clut_vga16.ppm
drivers/video/logo/clut_vga16.ppm