From: Ben Skeggs Date: Tue, 17 Aug 2010 02:02:43 +0000 (+1000) Subject: drm/nouveau: fix earlier mistake when fixing merge conflict X-Git-Tag: v2.6.36-rc3~46^2^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=625db6b7e34580b750a13fd36a211a4366f6c3e2;p=pandora-kernel.git drm/nouveau: fix earlier mistake when fixing merge conflict Signed-off-by: Ben Skeggs --- Reading git-diff-tree failed