| commit | c02c873c25209f971c2e10884f50d4ab61db1e23 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Mar 24 16:50:27 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Mar 24 16:50:27 2010 -0700 |
| tree | 16238386f017babcca9c62454e0f169b22fef100 | |
| parent | 541e40ee087976ec793c53446099d3f0097e1697 [diff] | |
| parent | 332ac7ff77cdc6a183d78ab129545d7b14a1d57c [diff] |
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