tree ea74ea0878b2f07eb70f2d5b42be5ec42f3bdb5f
parent 3e0dc6b01f5301d63046f6deddde2c7f5c57d67a
parent 0d72c6fcb5cd215eeab824fac216ea42c5b574aa
author Keith Packard <keithp@keithp.com> 1309368894 -0700
committer Keith Packard <keithp@keithp.com> 1309368894 -0700

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