tree 9dab29e11c967211cb8b9bd5c45bee8cd75c723a
parent bee4d4acf563f91a7796cca53111d91be2532935
parent 2b1ecb7337592a7bf0989efac46a5b52daab769e
author Keith Packard <keithp@keithp.com> 1309552429 -0700
committer Keith Packard <keithp@keithp.com> 1309552429 -0700

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