1a7564
parent 4bf3631cdb012591667ab927fcd7719d92837833
parent 01abc2aa0f447bce2f6beb06dd0607ba0f01c5bb
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1177432327 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1177432327 -0700

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)"
٥��+x