Merge tag 'efi-urgent' into x86/efi
[pandora-kernel.git] / include / linux / libata.h
Simple merge