0700
committer Keith Packard <keithp@keithp.com> 1309380473 -0700

Merge branch 'drm-intel-fixes' into drm-intel-next
e$_nž&x