Merge branch 'next' into for-linus-3.0
[pandora-kernel.git] / drivers / ata / libahci.c
Simple merge