Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Nov 2010 19:59:49 +0000 (11:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Nov 2010 19:59:49 +0000 (11:59 -0800)
commit6656b3fc8aba2eb7ca00c06c7fe4917938b0b652
tree75516a951a337809f5548cc19204fd2d33cfffae
parent33e0d57f5d2f079104611be9f3fccc27ef2c6b24
parentb1353e4f40f6179ab26a3bb1b2e1fe29ffe534f5
Merge branch 'upstream-linus' of git://git./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