Merge branch 'fix/hda' into for-linus
[pandora-kernel.git] / drivers / ata / libata-sff.c
Simple merge