diff options
| author | Dave Airlie | 2012-02-28 08:20:14 +0000 |
|---|---|---|
| committer | Dave Airlie | 2012-02-28 08:20:14 +0000 |
| commit | e2bc96aeff3c32534c01229ea365f2db6ea0cb74 (patch) | |
| tree | 1b188545d5ba3be7ae1d757518602911de814184 /kernel/cpu_pm.c | |
| parent | 500dd2370e77c9551ba298bdeeb91b02d8402199 (diff) | |
| parent | 5d031e5b633d910f35e6e0abce94d9d842390006 (diff) | |
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/drm-intel into HEAD
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/drm-intel:
drm/i915: Remove use of the autoreported ringbuffer HEAD position
drm/i915: Prevent a machine hang by checking crtc->active before loading lut
drm/i915: fix operator precedence when enabling RC6p
drm/i915: fix a sprite watermark computation to avoid divide by zero if xpos<0
drm/i915: fix mode set on load pipe. (v2)
Diffstat (limited to 'kernel/cpu_pm.c')
0 files changed, 0 insertions, 0 deletions