From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Thu, 7 Dec 2006 17:16:07 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.20-rc1~15^2~14^2~12
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=2fd8507d14ef7af3ae05316b3277044cf6daa381;p=safe%2Fjmp%2Flinux-2.6

Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev

* '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
---

2fd8507d14ef7af3ae05316b3277044cf6daa381