From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 7 Mar 2008 21:17:59 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.25-rc5~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb641ab496d5b8eb835ae1933926fdf23feb5260;p=thirdparty%2Fkernel%2Flinux.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:
  ide: update references to Documentation/ide/ide.txt (v2)
  ide: move ide.txt to Documentation/ide/
  ide: fix buggy code in ide_register_hw()
  ide: fix enabling DMA on it821x in "smart" mode
  ide-cd: mark REQ_TYPE_ATA_PC write requests with REQ_RW flag
---

bb641ab496d5b8eb835ae1933926fdf23feb5260