From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Oct 2012 10:47:12 +0000 (+0900)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v3.7-rc1~63
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ba7067651083bdcc37223d8879478cbc51cca923;p=profile%2Fcommon%2Fkernel-common.git

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull nouveau drm fixes from Dave Airlie:
 "Just a bunch of nouveau fixes, Ben wants to get some alternate
  versions into stable."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  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
---

ba7067651083bdcc37223d8879478cbc51cca923