diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-23 11:02:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-23 11:02:41 -0800 |
| commit | fe6ea1f7e5c2d3947bf62f2a219e69718ca0b187 (patch) | |
| tree | 7c6efcc79f7b12f28315a61e10c9a984fd787043 /include/asm-parisc | |
| parent | 6d7de67c5e4f2e9cdcf9b0a096380846e6a8278b (diff) | |
| parent | 184231bdb41fc4c385ae8e115f5afaff02fe1690 (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:
NetXen: Use pci_register_driver() instead of pci_module_init() in init_module
NetXen: Firmware check modifications
ehea: Fixed possible nullpointer access
ehea: Added logging off associated errors
ehea: Improved logging of permission issues
ehea: New method to determine number of available ports
ehea: Modified initial autoneg state determination
ehea: Fixing firmware queue config issue
ehea: Fixed wrong dereferencation
PHY: Export phy ethtool helpers
modify 3c589_cs to be SMP safe
Diffstat (limited to 'include/asm-parisc')
0 files changed, 0 insertions, 0 deletions