Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Mar 2010 23:50:27 +0000 (16:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Mar 2010 23:50:27 +0000 (16:50 -0700)
commitc02c873c25209f971c2e10884f50d4ab61db1e23
tree16238386f017babcca9c62454e0f169b22fef100
parent541e40ee087976ec793c53446099d3f0097e1697
parent332ac7ff77cdc6a183d78ab129545d7b14a1d57c
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