tree 7f027e92e4578e293b20ac1f2c389600a795ea7f
parent f3c91c1deaf8493526d8216be94c33e963f00962
parent 3561d43fd289f590fdae672e5eb831b8d5cf0bf6
author Chris Wilson <chris@chris-wilson.co.uk> 1290415663 +0000
committer Chris Wilson <chris@chris-wilson.co.uk> 1290415663 +0000

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