Merge upstream kernel changes into 'C/H/S support' branch of libata.