diff options
| author |   James Bottomley <jejb@sparkweed.localdomain> | 2006-09-23 15:33:43 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@sparkweed.localdomain> | 2006-09-23 15:33:43 -0500 |
| commit | c9802cd9574a80444e689c7525627b40d7dc3a06 (patch) | |
| tree | 5954e2ac7e97023b51d36127963a1e9262fbcfe0 /include/linux/workqueue.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
| parent | [SCSI] megaraid: Make megaraid_ioctl() check copy_to_user() return value (diff) | |
Merge mulgrave-w:git/scsi-misc-2.6
Conflicts:
drivers/scsi/iscsi_tcp.c
drivers/scsi/iscsi_tcp.h
Pretty horrible merge between crypto hash consolidation
and crypto_digest_...->crypto_hash_... conversion
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/linux/workqueue.h')
0 files changed, 0 insertions, 0 deletions