From: Linus Torvalds Date: Thu, 16 Aug 2012 18:08:32 +0000 (-0700) Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d3b8e0dc828f8ec9cc895bb46e8c51b2763e9d2c;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux Pull more drm fixes from Dave Airlie: "Just some intel and nouveau ones this time, intel has more edp panel fixes for macbooks and nouveau has a suspend/resume regression fix in there." * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/i915: Apply post-sync write for pipe control invalidates drm/i915: reorder edp disabling to fix ivb MacBook Air drm/nv86/fifo: suspend fix drm/nouveau: disable copy engine on NVAF nouveau: fixup scanout enable in nvc0_pm drm/nouveau/aux: mask off higher bits of auxch index in i2c table entry drm/nvd0/disp: mask off high 16 bit of negative cursor x-coordinate drm/i915: ensure i2c adapter is all set before adding it drm/i915: ignore eDP bpc settings from vbt drm/i915: Fix blank panel at reopening lid drm/nve0/fifo: add support for the flip completion swmthd --- d3b8e0dc828f8ec9cc895bb46e8c51b2763e9d2c