diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-13 16:40:57 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-13 16:40:57 +0200 |
commit | fa8d84b78be10d0c455dd716f40152bb7003bd5b (patch) | |
tree | 8b051596111afec96c2fb687a57414340e76c4d5 /drivers/net/sky2.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
parent | ahci: Workaround HW bug for SB600/700 SATA controller PMP support (diff) | |
download | linux-fa8d84b78be10d0c455dd716f40152bb7003bd5b.tar.xz linux-fa8d84b78be10d0c455dd716f40152bb7003bd5b.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:
ahci: Workaround HW bug for SB600/700 SATA controller PMP support
ahci: workarounds for mcp65
Diffstat (limited to 'drivers/net/sky2.c')
0 files changed, 0 insertions, 0 deletions