diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-02 18:32:18 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-02 18:32:18 (GMT) |
| commit | 2640c9a90fa596871e142f42052608864335f102 (patch) | |
| tree | bf0fb0e59b324963d650a7e82f83c1a4f993aa69 /arch/s390/crypto/sha1_s390.c | |
| parent | 80618fa83a34a26199fa99cfd06476a81ddf57df (diff) | |
| parent | b16aabc9374217fa2d28e72fd9a6e6d60905e1b9 (diff) | |
| download | linux-fsl-qoriq-2640c9a90fa596871e142f42052608864335f102.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (32 commits)
ide-atapi: start dma in a drive-specific way
ide-atapi: put the rest of non-ide-cd code into the else-clause of ide_transfer_pc
ide-atapi: remove timeout arg to ide_issue_pc
ide-cd: remove handler wrappers
ide-cd: remove xferlen arg to cdrom_start_packet_command
ide-atapi: split drive-specific functionality in ide_issue_pc
ide-atapi: assign expiry and timeout based on device type
ide-atapi: compute cmd_len based on device type in ide_transfer_pc
ide: remove the last ide-scsi remnants
ide-atapi: remove ide-scsi remnants from ide_pc_intr()
ide-atapi: remove ide-scsi remnants from ide_transfer_pc()
ide-atapi: remove ide-scsi remnants from ide_issue_pc
ide-cd: move cdrom_timer_expiry to ide-atapi.c
ide-atapi: teach ide atapi about drive->waiting_for_dma
ide-atapi: accomodate transfer length calculation for ide-cd
ide-atapi: setup dma for ide-cd
ide-atapi: combine drive-specific assignments
ide-atapi: add a dev_is_idecd-inline
remove ide-scsi
ide-floppy: allocate only toplevel packet commands
...
Diffstat (limited to 'arch/s390/crypto/sha1_s390.c')
0 files changed, 0 insertions, 0 deletions