diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-22 19:46:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-22 19:46:29 -0700 |
| commit | d5a30458a90597915977f06e79406b664a41b8ac (patch) | |
| tree | 377cf40e56f3503b031a40ac242a9368cf2cfb20 /fs/ocfs2 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| parent | libata: ensure NCQ error result taskfile is fully initialized (diff) | |
| download | linux-dev-d5a30458a90597915977f06e79406b664a41b8ac.tar.xz linux-dev-d5a30458a90597915977f06e79406b664a41b8ac.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:
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()
Diffstat (limited to 'fs/ocfs2')
0 files changed, 0 insertions, 0 deletions