tree 0d0c3612cc70e6d886464b2bdc7766d64e7af6c8
parent 887a82ee80b42bb14ba70f8138292023d5040b08
parent e85194641bec56179dcf5e1704ce5c6bf30340c6
author Keith Packard <keithp@keithp.com> 1311632539 -0700
committer Keith Packard <keithp@keithp.com> 1311632539 -0700

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