diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 15:58:51 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 15:58:51 -0700 |
commit | 1e66239e23dd0422baf891bf6af0b65ac632b676 (patch) | |
tree | 5646c17cef8cea3e37b35ff6b0d54b8e5602e26e /include/asm-ia64/ioctls.h | |
parent | 7742c0bc8594cf1bcbad1f3e876acae5b644dc7b (diff) | |
parent | 64a8170975947978ea4094dd6c4b1f41119d6ae6 (diff) |
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:
pata_hpt37x: Fix 2.6.22 clock PLL regression
pata_ali: Correct HP detect
ata_piix: fix suspend/resume for some TOSHIBA laptops
PCI: export __pci_reenable_device()
Diffstat (limited to 'include/asm-ia64/ioctls.h')
0 files changed, 0 insertions, 0 deletions