Merge branch 'master' into upstream
[firefly-linux-kernel-4.4.55.git] / drivers / ide / ide-generic.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2