tree a4069b104045797da2dc48c62e1acba0132ba98d
parent 8daf7473203cd9bd1b9b98200ee1c74dfe4826fe
parent d270ae34eb77c58dea60e5b1e300a698d2ce39ac
author Chris Wilson <chris@chris-wilson.co.uk> 1285685318 +0100
committer Chris Wilson <chris@chris-wilson.co.uk> 1285685318 +0100

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