From: David Woodhouse Date: Fri, 8 Jan 2010 01:38:39 +0000 (+0000) Subject: Merge from fixed from-kernel tree to fix Matrox firmware binaries X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c024a251e1dd1a39de610bbdc2af65b36e42637d;hp=c103430a955a286e459a658d6300557fb1d72ad4;p=linux-firmware 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 f80aba2..2c7f7fe 100644 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 f80aba2..57f1088 100644 Binary files a/matrox/g400_warp.fw and b/matrox/g400_warp.fw differ