From: Linus Torvalds Date: Thu, 28 Jun 2012 18:26:42 +0000 (-0700) Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4a9c46978d9a7e8f2b41f757eb24bd190b1a3b7b;p=linux-beck.git Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux Pull drm fixes from Dave Airlie: "Nearly all intel, one missing license header in nouveau, nothing majorly earth shattering." * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: Revert "drm/i915: allow PCH PWM override on IVB" drm/nouveau: add license header to prime. drm/i915: Fix eDP blank screen after S3 resume on HP desktops drm/i915: rip out the PM_IIR WARN --- 4a9c46978d9a7e8f2b41f757eb24bd190b1a3b7b