| commit | 7f8ed1855d7f23eb5fa1b5d2f890b748ecf95179 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Mar 22 17:06:57 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Mar 22 17:06:57 2008 -0700 |
| tree | 7b653c10a686611c007210d5140074c30d2571b5 | |
| parent | 0d995b2b446c2304c04058bedba49460823adbf7 [diff] | |
| parent | ca4e2ab5b2764562fe3d41b95b27e6bbd4733d66 [diff] |
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[]