]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'drm-intel/for-linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 19 Sep 2013 01:36:34 +0000 (11:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 19 Sep 2013 01:36:34 +0000 (11:36 +1000)
commit6ef61178251d376213ebd7fb1986e273d37805d5
tree5eda2c8dcc6241ed250fd001e6e9211be3ad6a63
parent49c728b81bfa5bc5e5a691249382d371b0dfbaa3
parent507c1a454809da54af21091875f883e0364c5378
Merge remote-tracking branch 'drm-intel/for-linux-next'

Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_drv.h
12 files changed:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_stolen.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_dvo.c
drivers/gpu/drm/i915/intel_opregion.c
drivers/gpu/drm/i915/intel_panel.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/i915/intel_sdvo.c