| commit | ceb736c395058699dc82e5efdb2a9279a5b29451 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Tue Oct 09 14:48:46 2012 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Tue Oct 09 14:48:46 2012 +1000 |
| tree | 6fc6d72ef378c3e4b314383f8559f388a05e47fa | |
| parent | 1f31c69dac71bebc0f00bc8534a6345782045501 [diff] | |
| parent | 11573aa78858598cabedc472538998474b2e8efd [diff] |
Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next Just misc nouveau fixes all over the place. * 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau/timer: bump ptimer's alarm delay from u32 to u64 drm/nouveau/fan: fix a typo in PWM's input clock calculation drm/nv50/clk: wire up pll_calc hook drm/nouveau: remove unused _nouveau_parent_ctor drm/nouveau/bios: fix shadowing of ACPI ROMs larger than 64KiB