Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream