Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev