Merge branch 'v2.6.34-rc2' into drm-linus