tree c7a124662da83f054bc9fb6a60735f528d8d6d30
parent c8c99b0f0dea1ced5d0e10cdb9143356cc16b484
parent 7cd015a0a37265e23bbdce7ce8f7e00507abe9ed
author Keith Packard <keithp@keithp.com> 1316641966 -0700
committer Keith Packard <keithp@keithp.com> 1316641966 -0700

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