diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-25 10:59:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-25 10:59:59 -0400 |
| commit | 36373b4450105ec8908c6c9396c8715eaafcfd6a (patch) | |
| tree | bbac0eab8d2d2b0d39e86092825d35fdf2d5ec40 /include/linux/pci_ids.h | |
| parent | 0b887d037bf4b76eec1c960e5feecd6a5a806971 (diff) | |
| parent | 2972863768cc2ef94734abb22dec6a46b0891307 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
myri10ge: update driver version to 1.3.2-1.269
myri10ge: use pcie_get/set_readrq
ehea: fix queue destructor
ehea: fix module parameter description
ehea: fix interface to DLPAR tools
sgiseeq: Fix return type of sgiseeq_remove
sky2 1.17
sky2: only bring up watchdog if link is active
sky2: clear PCI power control reg at startup
DM9000: fix interface hang under load
phy layer: fix genphy_setup_forced (don't reset)
Don't use GFP_DMA for zone allocation.
fix realtek phy id in forcedeth
Diffstat (limited to 'include/linux/pci_ids.h')
0 files changed, 0 insertions, 0 deletions