Merge of 'for-linus' branch from
[cascardo/linux.git] / drivers / ide / ide.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2