tree 16238386f017babcca9c62454e0f169b22fef100
parent 541e40ee087976ec793c53446099d3f0097e1697
parent 332ac7ff77cdc6a183d78ab129545d7b14a1d57c
author Linus Torvalds <torvalds@linux-foundation.org> 1269474627 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1269474627 -0700

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