Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Sun, 26 Jun 2011 00:08:13 +0000 (17:08 -0700)
committerKeith Packard <keithp@keithp.com>
Sun, 26 Jun 2011 00:08:13 +0000 (17:08 -0700)
commit93dbb29b471c80e09df8bfde9c661df074ec82cc
treefb57e9d1e4f875d25ea165ff53d55842cd476f92
parentb97c3d9c1655522be3adc5ae1aa153a18467e924
parent483f1798998ede75b2575cc1813c3d89ba64a34e
Merge branch 'drm-intel-fixes' into drm-intel-next