Merge branch 'cfq' into for-linus