| commit | f08859a9b08024067e178ad3b158164477140a0a | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@gmail.com> | Wed Aug 29 20:05:40 2012 +1000 |
| committer | Dave Airlie <airlied@gmail.com> | Wed Aug 29 20:05:40 2012 +1000 |
| tree | a61195e3160127c00057833bd13f0c3329c0a222 | |
| parent | 7c4eaca4162d0b5ad4fb39f974d7ffd71b9daa09 [diff] | |
| parent | 14f0458a41e033dee31ba605137419385c03fc78 [diff] |
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