Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 24 Apr 2007 16:32:07 +0000 (09:32 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 24 Apr 2007 16:32:07 +0000 (09:32 -0700)
commit32bd33e21eeab63e7265bb3cba9ed94ab1ab816e
treec22b1dc22bdf57c586c1fb86f202353a061a7564
parent4bf3631cdb012591667ab927fcd7719d92837833
parent01abc2aa0f447bce2f6beb06dd0607ba0f01c5bb
Merge /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)"