diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 23:41:00 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 23:41:00 +0200 |
| commit | ac7f6b5e44cb0982b98c31fa33298ba73fb5dcfc (patch) | |
| tree | 32d5f592be4222f0d6a8a05fcbc1c2eaed729499 /drivers/net/wireless/zd1201.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| parent | [libata] Don't use old-EH ->eng_timeout() hook when not needed (diff) | |
| download | linux-ac7f6b5e44cb0982b98c31fa33298ba73fb5dcfc.tar.xz linux-ac7f6b5e44cb0982b98c31fa33298ba73fb5dcfc.zip | |
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 'drivers/net/wireless/zd1201.c')
0 files changed, 0 insertions, 0 deletions