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.

diff --git a/matrox/g200_warp.fw b/matrox/g200_warp.fw
index f80aba2e8408078b844a97d3970121488d17f415..2c7f7fec396622ba946146721295e804fcceec65 100644 (file)
Binary files a/matrox/g200_warp.fw and b/matrox/g200_warp.fw differ

diff --git a/matrox/g400_warp.fw b/matrox/g400_warp.fw
index f80aba2e8408078b844a97d3970121488d17f415..57f1088e06fbc6bc64bc74b97edc32999a42eff1 100644 (file)
Binary files a/matrox/g400_warp.fw and b/matrox/g400_warp.fw differ