Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core-next