| commit | 4a9c46978d9a7e8f2b41f757eb24bd190b1a3b7b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 28 11:26:42 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 28 11:26:42 2012 -0700 |
| tree | bd36a6b474bc61050ecb80fd961e7ea04f403202 | |
| parent | ef726227e74fa59900efe3223136a53f01b245a8 [diff] | |
| parent | 2266b058d3ab9dfc545305d68e754ad9c9a639a0 [diff] |
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