From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Nov 2010 19:59:49 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.37-rc3~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2.6.37-rc2-test-00124-g6656b3f;p=~emulex%2Finfiniband.git

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

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  sata_via: apply magic FIFO fix to vt6420 too
---

6656b3fc8aba2eb7ca00c06c7fe4917938b0b652