From: Dave Airlie Date: Fri, 10 May 2013 04:35:48 +0000 (+1000) Subject: Merge branch 'for-linux-next' of git://people.freedesktop.org/~danvet/drm-intel into... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f3c58ceef014ea7f8a253b50b8af81b3b898bc77;p=linux-beck.git Merge branch 'for-linux-next' of git://people.freedesktop.org/~danvet/drm-intel into drm-next Daniel writes: A few intel fixes for smaller issues and one revert for an sdv hack which we've wanted to kill anyway. Plus two drm patches included for your convenience, both regression fixers for mine own screw-ups. + both fixes for stolen mem handling. * 'for-linux-next' of git://people.freedesktop.org/~danvet/drm-intel: drm/i915: clear the stolen fb before resuming Revert "drm/i915: Calculate correct stolen size for GEN7+" drm/i915: hsw: fix link training for eDP on port-A Revert "drm/i915: revert eDP bpp clamping code changes" drm: don't check modeset locks in panic handler drm/i915: Fix pipe enabled mask for pipe C in WM calculations drm/mm: fix dump table BUG drm/i915: Always normalize return timeout for wait_timeout_ioctl --- f3c58ceef014ea7f8a253b50b8af81b3b898bc77