]> 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>
Fri, 27 Sep 2013 03:31:59 +0000 (13:31 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 27 Sep 2013 03:31:59 +0000 (13:31 +1000)
commitf659a4f17bbecdbad57dd5c63a1783e5ec5fd792
treeb61a871dfb34df695b8f599c8a9cdf2abc2bee46
parent3aea97448dceda0a5eaef06a27a6d971f4036ccd
parentcd298302c6ef3d71cf993d5a4db6819330a471c0
Merge remote-tracking branch 'drm-intel/for-linux-next'

Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gpu_error.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_tv.c