]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'drm/drm-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 02:55:48 +0000 (12:55 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 02:55:48 +0000 (12:55 +1000)
commit26153180d3d4172765048d27f2efb5ff9cb1309d
tree6ef3efd87e7df6ea6c01e8d988ed1d3d9b51cc16
parenta2c94970a9da0a038769cb4f7c6bcaec45715c03
parent279119776d98305af08466c6cc9b7869c57c706f
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/i915/intel_sdvo.c
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_lvds.c
drivers/gpu/drm/i915/intel_sdvo.c
drivers/gpu/drm/mgag200/mgag200_mode.c