]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'drm/drm-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 02:22:33 +0000 (12:22 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 02:22:33 +0000 (12:22 +1000)
commit7393b56ab48afb2b6ca9cdc4c0cf46ae2d4488d8
tree23696a0f7dd5489fdbd0a8a9ee34f79438cb0852
parente3a01816bbbdb7f5431780501f44c1391838d899
parent1c1aa6e083d2eb1f3f76e972d5aba3003255d426
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/i915/intel_i2c.c
Documentation/kernel-parameters.txt
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_ringbuffer.c
drivers/gpu/drm/radeon/r100.c
drivers/gpu/drm/radeon/r600.c
include/linux/vgaarb.h