projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4c1aa6f 1c10e93)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 7 Mar 2008 21:17:59 +0000 (13:17 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 7 Mar 2008 21:17:59 +0000 (13:17 -0800)
commitbb641ab496d5b8eb835ae1933926fdf23feb5260
tree12d8437158fd16b58fc324fb7e2f8781e2463a9ctree | snapshot
parent4c1aa6f8b9686ddc7221f0f3b63f9b7dd1467543commit | diff
parent1c10e93828f8861c3f58d647e259de0e2c63b930commit | diff
Merge git://git./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
John Crispins staging tree