diff options
author | James Bottomley <jejb@mulgrave.(none)> | 2005-10-29 09:42:17 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-10-29 09:42:17 -0500 |
commit | 80e23babfcf21a2dc726d3be00e06993f02f0274 (patch) | |
tree | b4b3d48156c72e6c4997cae00fa270715a754066 /drivers/acpi/hotkey.c | |
parent | 19a7b4aebf9ad435c69a7e39930338499af4d152 (diff) |
[SCSI] fix up mismerge in osst
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/acpi/hotkey.c')
0 files changed, 0 insertions, 0 deletions