| commit | 4f256e8aa3eda15c11c3cec3ec5336e1fc579cbd | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Mon May 07 16:09:09 2012 +0100 |
| committer | Dave Airlie <airlied@redhat.com> | Mon May 07 16:09:35 2012 +0100 |
| tree | 33c02b5e18e79756005a3edfa7c862a47de668d5 | |
| parent | 4086b1e2b19729eebf632073b9d4ab811726d8eb [diff] | |
| parent | dc257cf154be708ecc47b8b89c12ad8cd2cc35e4 [diff] |
Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next Daniel prepared this branch with a back-merge as git was getting very confused about changes in intel_display.c