diff options
| author |   Tejun Heo <htejun@gmail.com> | 2006-05-15 20:59:15 +0900 |
|---|---|---|
| committer | Tejun Heo <htejun@gmail.com> | 2006-05-15 20:59:15 +0900 |
| commit | 12436c30f4808e00fa008c6787c609bc6ae216ba (patch) | |
| tree | 22ddaad8def4f4a77637a3da62a8d8f422a95c29 /include/linux/kernel.h | |
| parent | [PATCH] sata_sil24: convert to new EH (diff) | |
| parent | Merge branch 'upstream' into irq-pio (diff) | |
Merge branch 'irq-pio'
Conflicts:
drivers/scsi/libata-core.c
include/linux/libata.h
Diffstat (limited to 'include/linux/kernel.h')
0 files changed, 0 insertions, 0 deletions