Merge branch 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux into drm...