diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-27 14:41:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-27 14:41:51 -0400 |
| commit | 49fdf6785fd660e18a1eb4588928f47e9fa29a9a (patch) | |
| tree | 71cccf385d734bfc33e9cd4752b5046aef99c130 /crypto/cast5.c | |
| parent | b70a6b27ed4cbb9ea7a4e1abc080ed65692ecb9b (diff) | |
| parent | 43a49cbdf31e812c0d8f553d433b09b421f5d52c (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
libata: fix NCQ devices behind port multipliers
scsi: make sure that scsi_init_shared_tag_map() doesn't overwrite existing map
Diffstat (limited to 'crypto/cast5.c')
0 files changed, 0 insertions, 0 deletions