tree fb57e9d1e4f875d25ea165ff53d55842cd476f92
parent b97c3d9c1655522be3adc5ae1aa153a18467e924
parent 483f1798998ede75b2575cc1813c3d89ba64a34e
author Keith Packard <keithp@keithp.com> 1309046893 -0700
committer Keith Packard <keithp@keithp.com> 1309046893 -0700

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