tree 4cde78329a06fdf07e3d780881481d9ae1d021fb
parent 490213556ad5bc1b46857bce1bc2c6db41d3e63d
parent e08fb4f6d1dc95eff5b3fc1d0412bcb5afcae7f2
author Linus Torvalds <torvalds@linux-foundation.org> 1235584170 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1235584170 -0800

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/i915: convert DRM_ERROR to DRM_DEBUG in phys object pwrite path
  drm/i915: make hw page ioremap use ioremap_wc
  drm: edid revision 0 is valid
  drm: Correct unbalanced drm_vblank_put() during mode setting.
  drm: disable encoders before re-routing them
  drm: Fix ordering of bit fields in EDID structure leading huge vsync values.
  drm: Fix shifts of EDID vsync offset/width fields.
  drm/i915: handle bogus VBT panel timing
  drm/i915: remove PLL debugging messages