Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux...
authorDave Airlie <airlied@gmail.com>
Wed, 29 Aug 2012 10:05:40 +0000 (20:05 +1000)
committerDave Airlie <airlied@gmail.com>
Wed, 29 Aug 2012 10:05:40 +0000 (20:05 +1000)
commitf08859a9b08024067e178ad3b158164477140a0a
treea61195e3160127c00057833bd13f0c3329c0a222
parent7c4eaca4162d0b5ad4fb39f974d7ffd71b9daa09
parent14f0458a41e033dee31ba605137419385c03fc78
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