commit | aefe6475720bd5eb8aacbc881488f3aa65618562 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 17 16:20:29 2009 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 17 16:20:29 2009 -0700 |
tree | 4397d83610ebf2a41a61a4466b0572dcebbf806d | |
parent | d022bafbb66a2662edaee5bf38bf0f70a755dcd0 [diff] | |
parent | 16e6aeca9e86fb0effb847c1687c9b2cc8e3fb4c [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] fix build error on drivers/ata/pata_legacy.c pata_via: Cache and rewrite the device bit sata_mv: workaround for multi_count errata sata24 sata_mv: tidy up qc->tf usage in qc_prep() functions