From: Dave Airlie <airlied@redhat.com>
Date: Tue, 9 Oct 2012 04:48:46 +0000 (+1000)
Subject: Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux... 
X-Git-Url: https://git.stricted.de/?p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git;a=commitdiff_plain;h=ceb736c395058699dc82e5efdb2a9279a5b29451

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

ceb736c395058699dc82e5efdb2a9279a5b29451