Merge from fixed from-kernel tree to fix Matrox firmware binaries

Not entirely sure how these went wrong; will keep a closer eye on the auto-conversion script. Thanks to Erik Inge Bolsø for spotting it.

Merge from fixed from-kernel tree to fix Matrox firmware binaries
Not entirely sure how these went wrong; will keep a closer eye on the auto-conversion script. Thanks to Erik Inge Bolsø for spotting it.
c024a251 · David Woodhouse · c103430a · 199a2619 · c024a251 · c024a251
Commit c024a251 authored Jan 08, 2010 by David Woodhouse
--- a/matrox/g200_warp.fw
+++ b/matrox/g200_warp.fw
--- a/matrox/g400_warp.fw
+++ b/matrox/g400_warp.fw