Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
[linux-2.6] / include / linux / matroxfb.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2