[PATCH] libata-dev: Fix merge problem with upstream