Merge branch 'gpu-switcher' of /ssd/git//linux-2.6 into drm-next-stage