tree 33c02b5e18e79756005a3edfa7c862a47de668d5
parent 4086b1e2b19729eebf632073b9d4ab811726d8eb
parent dc257cf154be708ecc47b8b89c12ad8cd2cc35e4
author Dave Airlie <airlied@redhat.com> 1336403349 +0100
committer Dave Airlie <airlied@redhat.com> 1336403375 +0100

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