libata: Fix EH merge difference between this branch and upstream.
3 files changed