From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Mar 2010 23:50:27 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=c02c873c25209f971c2e10884f50d4ab61db1e23;p=linux-edison.git

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:
  libata-sff: fix spurious IRQ handling
  pata_via: Add VIA VX900 support
---

c02c873c25209f971c2e10884f50d4ab61db1e23