Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm...

Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101

Conflicts:

	shared-core/i915_init.c - reconcile with airlied's new code