aboutsummaryrefslogtreecommitdiff
path: root/include/linux/if.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-09-27 14:41:00 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-27 14:41:00 -0700
commitac7f6b5e44cb0982b98c31fa33298ba73fb5dcfc (patch)
tree32d5f592be4222f0d6a8a05fcbc1c2eaed729499 /include/linux/if.h
parent1f9bd4c96a8e918a86e083706e0d3eb7f030b9a3 (diff)
parentbda3028813bd07f34f30288a492fbf6f7b8712dd (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: [libata] Don't use old-EH ->eng_timeout() hook when not needed [libata] sata_mv: fix oops by filling in missing hook [libata] One more s/15/ATA_SECONDARY_IRQ/ substitution [libata] pata_serverworks: fill in ->irq_clear hook [PATCH] pata_serverworks: correct PCI ID in cable detection table [PATCH] libata-sff: use our IRQ defines [PATCH] libata-eh: Remove layering violation and duplication when handling absent ports [PATCH] libata: tighten rules for legacy dependancies [PATCH] libata: refuse to register IRQless ports
Diffstat (limited to 'include/linux/if.h')
0 files changed, 0 insertions, 0 deletions