Merge by hand (whitespace conflicts in libata.h)
[firefly-linux-kernel-4.4.55.git] / Documentation / fb / matroxfb.txt
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2