From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 12 Oct 2007 04:47:20 +0000 (-0700)
Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.24-rc1~1451
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=547307420931344a868275bd7ea7a30f117a15a9;p=linux.git

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

* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] sata_mv: more S/G fixes
---

547307420931344a868275bd7ea7a30f117a15a9