| commit | e47fddf2470feb228e1d3ff41fc78dad4cfbbcc6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Feb 02 09:14:48 2007 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Feb 02 09:14:48 2007 -0800 |
| tree | be16dc950dda26f44aaa09455879acbca7efbcae | |
| parent | 222335b755726f539c4a056ce119e017aa4166c4 [diff] | |
| parent | 49c8042996c84f0df6c49ea2e28a7ef38cd7d773 [diff] |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: Initialize nbytes for internal sg commands libata: Fix ata_busy_wait() kernel docs pata_via: Correct missing comments pata_atiixp: propogate cable detection hack from drivers/ide to the new driver ahci/pata_jmicron: fix JMicron quirk