diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 13:50:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-05 13:50:49 -0800 |
| commit | 3131e530ac3faf09fb0878a9dc4cd6df0e35b6a3 (patch) | |
| tree | 9748b27196cbec3950cbec566f06680125ddb21b /net/xfrm | |
| parent | 41557e7c56dc96ddd0b068fe76d5118d516d4f04 (diff) | |
| parent | bcbf6ee3eb5212ff774161cae15ce4f92f7edafb (diff) | |
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:
ide: fix IDE_HFLAG_NO_ATAPI_DMA handling in config_drive_for_dma()
ide: move ide_fixstring() documentation to ide-iops.c from ide.h
ide: add missing #ifdef/#endif CONFIG_IDE_TASK_IOCTL
ide: fix ide_find_dma_mode() to print human-readable info
ide: add missing rq.ref_count initialization to ide_diag_taskfile()
ide: clear HOB bit for REQ_TYPE_ATA_TASK requests in ide_end_drive_cmd()
ide: check rq->cmd_type in drive_cmd_intr()
ide/Kconfig: fix BLK_DEV_OFFBOARD dependencies
ide: unexport ide_fix_driveid
ide/Kconfig: add IDEDISK_MULTI_MODE text adapted from hdparm manual page
ide: do_identify() string termination fix
piix: add support for ICH7 on Acer 5602aWLMi
Diffstat (limited to 'net/xfrm')
0 files changed, 0 insertions, 0 deletions