tree 4a2081bb992af5a2a195e741b5feb16b46e6ebd0
parent faa60c4174d943696b9478c5de6438c4f0fecba6
parent bcf50e2775bbc3101932d8e4ab8c7902aa4163b4
author Chris Wilson <chris@chris-wilson.co.uk> 1290543193 +0000
committer Chris Wilson <chris@chris-wilson.co.uk> 1290543193 +0000

Merge branch 'drm-intel-fixes' into drm-intel-next