diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-21 11:02:35 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-21 11:02:35 +0300 |
commit | 8df8bb4adf7e4abb48d29dc16c29eda40a64afed (patch) | |
tree | 65406f35f46bf5fdb51f61541a7b49f7bfec7231 /drivers/cdrom | |
parent | 28cb5ccd306e6cffd4498ba350bc7c82f5fbee44 (diff) | |
parent | 850a9d8a8bbeeba8263025a983d1c18e5e250f5d (diff) | |
download | linux-8df8bb4adf7e4abb48d29dc16c29eda40a64afed.tar.xz |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] sata_svw, sata_vsc: kill iomem warnings
[PATCH] libata: take scmd->cmd_len into account when translating SCSI commands
[PATCH] libata: kill @cdb argument from xlat methods
[PATCH] libata: clean up variable name usage in xlat related functions
[libata] Move some PCI IDs from sata_nv to ahci
[libata] pata_via: suspend/resume support fix
[libata] pata_cs5530: suspend/resume support tweak
Diffstat (limited to 'drivers/cdrom')
0 files changed, 0 insertions, 0 deletions