Merge branch 'for-queue' of https://github.com/agraf/linux-2.6 into queue