From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 23 Mar 2008 00:06:57 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.25-rc7~30
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7f8ed1855d7f23eb5fa1b5d2f890b748ecf95179;p=linux-2.6-omap-h63xx.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  Revert "ide-tape: schedule driver for removal after 6 months"
  ide: mark "hdx=remap" and "hdx=remap63" kernel parameters as obsoleted
  ide: mark "hdx=[driver_name]" and "hdx=scsi" kernel parameters as obsoleted
  ide: Documentation/ide/ide.txt fixes
  ide: mark special "ide0=" kernel parameters as obsoleted
  ide: remove commented out entries from ide_pio_blacklist[]
---

7f8ed1855d7f23eb5fa1b5d2f890b748ecf95179