Merge branch 'upstream' into pata-drivers