diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-03 00:36:21 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-03 00:50:36 +0100 |
commit | b9e68670cc3a13166b389ce847af19b0d0d33c67 (patch) | |
tree | bb79d91266490fa5bfe77cfef53ead8a1f7a62f6 /mm/mempolicy.c | |
parent | drm/i915: Kill the get_fence tracepoint (diff) | |
parent | drm/i915: Apply a workaround for transitioning from DP on pipe B to HDMI. (diff) | |
download | linux-b9e68670cc3a13166b389ce847af19b0d0d33c67.tar.xz linux-b9e68670cc3a13166b389ce847af19b0d0d33c67.zip |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/intel_drv.h
Diffstat (limited to 'mm/mempolicy.c')
0 files changed, 0 insertions, 0 deletions