Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / drivers / staging / xgifb / XGI_main.h
2010-06-04 apatard@mandriva.comstaging: Add framebuffer driver for XGI chipsets