From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 2 Feb 2007 17:14:48 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.20~13
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e47fddf2470feb228e1d3ff41fc78dad4cfbbcc6;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: Initialize nbytes for internal sg commands
  libata: Fix ata_busy_wait() kernel docs
  pata_via: Correct missing comments
  pata_atiixp: propogate cable detection hack from drivers/ide to the new driver
  ahci/pata_jmicron: fix JMicron quirk
---

e47fddf2470feb228e1d3ff41fc78dad4cfbbcc6