Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  Revert "adjust legacy IDE resource setting (v2)"
This commit is contained in:
Linus Torvalds 2007-04-24 09:32:07 -07:00
commit 32bd33e21e