tree 5ee9e7b5c553ce4c9dc1c0b7190f405e165787a7
parent bc67f799e7667fb3c00286f2415c3cc44a253aec
parent 1083694ab052e5ba38a8f9a057c4745448977837
author Keith Packard <keithp@keithp.com> 1310078391 -0700
committer Keith Packard <keithp@keithp.com> 1310078391 -0700

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