Merge branch 'for-airlied' of git://git.freedesktop.org/git/nouveau/linux-2.6 into...