tree 7a5ee32db0c25bb29598c7c300ce7f2680f533a9
parent af6261031317f646d22f994c0b467521e47aa49f
parent b30a3f6257ed2105259b404d419b4964e363928c
author Chris Wilson <chris@chris-wilson.co.uk> 1285056895 +0100
committer Chris Wilson <chris@chris-wilson.co.uk> 1285056895 +0100

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