| commit | 0e838b72d54ed189033939258a961f2a0cd59647 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Mon Jun 12 07:47:04 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Mon Jun 12 07:47:04 2006 -0700 |
| tree | 461db801b2188e43f871c15804ea6d04d08f8327 | |
| parent | 289a1e995e74734b5ec76ca8a5490058f4fecc24 [diff] | |
| parent | 2f9719b61e1fcf7422a016ac4f2420a0cc6ba320 [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: [PATCH] sata_mv: grab host lock inside eng_timeout