| commit | d5a30458a90597915977f06e79406b664a41b8ac | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 22 19:46:29 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 22 19:46:29 2010 -0700 |
| tree | 377cf40e56f3503b031a40ac242a9368cf2cfb20 | |
| parent | a4b7d3bb744bbaaceb94a9aaf6b5cbc6e5d230f0 [diff] | |
| parent | a09bf4cd53b8ab000197ef81f15d50f29ecf973c [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: ensure NCQ error result taskfile is fully initialized before returning it via qc->result_tf. libata: fix docs, RE port and device of libata.force ID separated by point pata_pcmcia/ide-cs: add IDs for transcend and kingston cards libata: fix locking around blk_abort_request()