tree 569b5a13b3f7030a603460d8d9ded035a6f7f48f
parent 897493504addc5609f04a2c4f73c37ab972c29b2
parent 49553c2ef88749dd502687f4eb9c258bb10a4f44
author Chris Wilson <chris@chris-wilson.co.uk> 1284336138 +0100
committer Chris Wilson <chris@chris-wilson.co.uk> 1284336138 +0100

Merge remote branch 'linus' into drm-intel-fixes