diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-25 00:58:51 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-25 00:58:51 +0200 |
| commit | 1e66239e23dd0422baf891bf6af0b65ac632b676 (patch) | |
| tree | 5646c17cef8cea3e37b35ff6b0d54b8e5602e26e /drivers/net/acenic.c | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| parent | pata_hpt37x: Fix 2.6.22 clock PLL regression (diff) | |
| download | linux-1e66239e23dd0422baf891bf6af0b65ac632b676.tar.xz linux-1e66239e23dd0422baf891bf6af0b65ac632b676.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:
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 'drivers/net/acenic.c')
0 files changed, 0 insertions, 0 deletions