diff options
author | 2007-06-20 15:39:50 -0700 | |
---|---|---|
committer | 2007-06-20 15:39:50 -0700 | |
commit | d025d7858f7415f558e89d870ad1a205954b64cd (patch) | |
tree | c405da2a5ce0e8b5e6db92fa4cc9df51c3a34e77 /crypto/algapi.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband (diff) | |
parent | firewire: Only set client->iso_context if allocation was successful. (diff) | |
download | linux-rng-d025d7858f7415f558e89d870ad1a205954b64cd.tar.xz linux-rng-d025d7858f7415f558e89d870ad1a205954b64cd.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: Only set client->iso_context if allocation was successful.
ieee1394: fix to ether1394_tx in ether1394.c
firewire: fix hang after card ejection
Diffstat (limited to 'crypto/algapi.c')
0 files changed, 0 insertions, 0 deletions