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)
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


Trivial merge