]> err.no Git - linux-2.6/commitdiff
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.osdl.org>
Thu, 7 Dec 2006 17:16:07 +0000 (09:16 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Thu, 7 Dec 2006 17:16:07 +0000 (09:16 -0800)
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] libata: Incorrect timing computation for PIO5/6
  [PATCH] sata_promise: new EH conversion, take 2
  [PATCH] libata: let ATA_FLAG_PIO_POLLING use polling pio for ATA_PROT_NODATA
  [PATCH] sata_promise: cleanups, take 2


Trivial merge