Merge branch 'features/ahci' into for-arnd-features