From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 24 Apr 2007 16:32:07 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.21~10
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=32bd33e21eeab63e7265bb3cba9ed94ab1ab816e;p=linux-2.6-omap-h63xx.git

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)"
---

32bd33e21eeab63e7265bb3cba9ed94ab1ab816e