Merge upstream kernel into libata 'passthru' branch