summaryrefslogtreecommitdiffstats
path: root/drivers/edac/amd64_edac_inj.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-11-29 20:23:56 +1000
committerDave Airlie <airlied@redhat.com>2012-11-29 20:23:56 +1000
commit7136470d4b37b46565b29b8b9425a8361421483b (patch)
tree8d70e633fa6ae403c7b6682a22b3e28e549b4416 /drivers/edac/amd64_edac_inj.c
parentbd3b49f25a3eae2d91432247b7565489120b6bcf (diff)
parent2ff4aeac39dbdcac934694413767f09a27965e11 (diff)
downloadblackbird-op-linux-7136470d4b37b46565b29b8b9425a8361421483b.tar.gz
blackbird-op-linux-7136470d4b37b46565b29b8b9425a8361421483b.zip
Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
Daniel writes: Besides the big item of lifting the "preliminary hw support" tag from the Haswell code, just small bits&pieces all over: - Leftover Haswell patches and some fixes from Paulo - LyncPoint PCH support (for hsw) - OOM handling improvements from Chris Wilson - connector property and send_vblank_event refactorings from Rob Clark - random pile of small fixes Note that the send_vblank refactorings will cause some locking WARNs to show up. Imre has fixed that up, but since all the driver changes outside of the drm core have been for exonys, those four patches are merged through the exonys-next tree. Meh, I've forgotten to cherry-pick an important fix from Ben for a regression in the 3.8 gen6+ gtt code. New pull request below. While I'm at it, the hdmi VIC patch for the drm edid code is still in my queue, I'll send you that in the next 3.8-fixes pull. * 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel: (33 commits) drm/i915: Fix pte updates in ggtt clear range drm/i915: promote Haswell to full support drm/i915: Report the origin of the LVDS fixed panel mode drm/i915: LVDS fallback to fixed-mode if EDID not present drm/i915/sdvo: kfree the intel_sdvo_connector, not drm_connector, on destroy drm/i915: drm_connector_property -> drm_object_property drm/i915: use drm_send_vblank_event() helper drm/i915: Use pci_resource functions for BARs. drm/i915: Borrow our struct_mutex for the direct reclaim drm/i915: Defer assignment of obj->gtt_space until after all possible mallocs drm/i915: Apply the IBX transcoder A w/a for HDMI to SDVO as well drm/i915: implement WaMbcDriverBootEnable on Haswell drm/i915: fix intel_ddi_get_cdclk_freq for ULT machines drm/i915: make the panel fitter work on pipes B and C on Haswell drm/i915: make the panel fitter work on pipes B and C on IVB drm/i915: don't intel_crt_init if DDI A has 4 lanes drm/i915: make DP work on LPT-LP machines drm/i915: fix false positive "Unclaimed write" messages drm/i915: use cpu/pch transcoder on intel_enable_pipe drm/i915: don't limit Haswell CRT encoder to pipe A ...
Diffstat (limited to 'drivers/edac/amd64_edac_inj.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud