From: Dave Airlie Date: Wed, 29 Aug 2012 10:05:40 +0000 (+1000) Subject: Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux... X-Git-Tag: MMI-PSA29.97-13-9~16064^2~4 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f08859a9b08024067e178ad3b158164477140a0a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes Ben says its just a single fix to avoid the wrong pcopy units being used. * 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: drm/nvc0/copy: check PUNITS to determine which copy engines are disabled --- f08859a9b08024067e178ad3b158164477140a0a