diff options
author | Jeff Garzik | 2006-05-20 06:36:08 +0200 |
---|---|---|
committer | Jeff Garzik | 2006-05-20 06:36:08 +0200 |
commit | 3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb (patch) | |
tree | addbc37a278a126a19e03edd8270e577c75a8829 /drivers/scsi/ata_piix.c | |
parent | Merge branch 'max-sect' into upstream (diff) | |
parent | [PATCH] libata-core: fix current kernel-doc warnings (diff) | |
download | kernel-qcow2-linux-3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb.tar.gz kernel-qcow2-linux-3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb.tar.xz kernel-qcow2-linux-3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb.zip |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/libata-core.c
Diffstat (limited to 'drivers/scsi/ata_piix.c')
0 files changed, 0 insertions, 0 deletions