diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-24 16:50:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-24 16:50:27 -0700 |
| commit | c02c873c25209f971c2e10884f50d4ab61db1e23 (patch) | |
| tree | 16238386f017babcca9c62454e0f169b22fef100 /net | |
| parent | 541e40ee087976ec793c53446099d3f0097e1697 (diff) | |
| parent | 332ac7ff77cdc6a183d78ab129545d7b14a1d57c (diff) | |
| download | lwn-c02c873c25209f971c2e10884f50d4ab61db1e23.tar.gz lwn-c02c873c25209f971c2e10884f50d4ab61db1e23.zip | |
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
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions