| commit | e6586240a66e38dff2fbefd89451cfcdd68dceac | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Tue May 01 12:25:06 2012 +0100 |
| committer | Dave Airlie <airlied@redhat.com> | Tue May 01 12:25:06 2012 +0100 |
| tree | 2561e0d9a91469172bc1fa44c139c075b1886387 | |
| parent | 655861e328cea83320190f4a57b3656ee952388c [diff] | |
| parent | b99da31ed8521eb78d5d6930f3128f8ecdb75fae [diff] |
Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes * 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6: drm/nv10/gpio: fix thinko in mask for gpio lines 2-9 nvc0/fb: shut up PMFB interrupt after the first occurrence drm/nouveau/hdmi: use correct hdmi regs for nvaa/nvac drm/nouveau/bios: fix regression on some nv4x board