diff options
| author | Tejun Heo <htejun@gmail.com> | 2006-05-15 07:59:15 -0400 |
|---|---|---|
| committer | Tejun Heo <htejun@gmail.com> | 2006-05-15 07:59:15 -0400 |
| commit | 12436c30f4808e00fa008c6787c609bc6ae216ba (patch) | |
| tree | 22ddaad8def4f4a77637a3da62a8d8f422a95c29 /drivers/scsi/ultrastor.h | |
| parent | 88ce7550c38f46c8697f53727a571bf838bee398 (diff) | |
| parent | 7894eaf291238a62a565e9e9777483beeb00eeae (diff) | |
Merge branch 'irq-pio'
Conflicts:
drivers/scsi/libata-core.c
include/linux/libata.h
Diffstat (limited to 'drivers/scsi/ultrastor.h')
0 files changed, 0 insertions, 0 deletions