diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-03 17:05:08 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-03 17:05:08 -0800 |
commit | 9c1a7747059a65dbc2d7703978841a37db699fbf (patch) | |
tree | 7bbbad1430fa70bcf1c4daaba7dd1dc88306c3b8 /drivers/ide | |
parent | 219f170a85fee524fa528ef75a0432b79af95d0b (diff) | |
parent | 1777f1a978153e8b887c1e1eb5160ac46098b142 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: ixp4xx - Fix qmgr_request_queue build failure
crypto: api - Fix module load deadlock with fallback algorithms
Diffstat (limited to 'drivers/ide')
0 files changed, 0 insertions, 0 deletions