summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/netx-eth.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-10-22 09:55:29 +1000
committerDave Airlie <airlied@redhat.com>2012-10-22 09:55:48 +1000
commit64acba6a7adfe8be2e28b7e903092db685328a08 (patch)
treee8591529268d853a4b76868f7df768d6de8c124d /drivers/net/ethernet/netx-eth.c
parent6f0c0580b70c89094b3422ba81118c7b959c7556 (diff)
parent74ce6b6c63262defba91c4d790b3f91074793c0d (diff)
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
Daniel writes: The big thing is the disabling of the hsw support by default, cc: stable. We've aimed for basic hsw support in 3.6, but due to a few bad happenstances we've screwed up and only 3.8 will have better modeset support than vesa. To avoid yet another round of fallout from such a gaffle on for the next platform we've added a module option to disable early hw support by default. That should also give us more flexibility in bring-up. Otherwise just small fixes: - 3 fixes from Egbert for sdvo corner cases - invert-brightness quirk entry from Egbert - revert a dp link training change, it regresses some setups - and shut up a spurious WARN in our gem fault handler. - regression fix for an oops on bit17 swizzling machines, introduce in 3.7 - another no-lvds quirk * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: drm/i915: Initialize obj->pages before use by i915_gem_object_do_bit17_swizzle() drm/i915: Add no-lvds quirk for Supermicro X7SPA-H drm/i915: Insert i915_preliminary_hw_support variable. drm/i915: shut up spurious WARN in the gtt fault handler Revert "drm/i915: Try harder to complete DP training pattern 1" DRM/i915: Restore sdvo_flags after dtd->mode->dtd Roundrtrip. DRM/i915: Don't clone SDVO LVDS with analog. DRM/i915: Add QUIRK_INVERT_BRIGHTNESS for NCR machines. DRM/i915: Don't delete DPLL Multiplier during DAC init.
Diffstat (limited to 'drivers/net/ethernet/netx-eth.c')
0 files changed, 0 insertions, 0 deletions