projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0d995b2 ca4e2ab)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Mar 2008 00:06:57 +0000 (17:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Mar 2008 00:06:57 +0000 (17:06 -0700)
commit7f8ed1855d7f23eb5fa1b5d2f890b748ecf95179
tree7b653c10a686611c007210d5140074c30d2571b5tree | snapshot
parent0d995b2b446c2304c04058bedba49460823adbf7commit | diff
parentca4e2ab5b2764562fe3d41b95b27e6bbd4733d66commit | diff
Merge git://git./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[]
John Crispins staging tree