diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-13 10:02:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-13 10:02:26 -0800 |
| commit | d72ec9e20e4de995aa957f171cf84b136689e4c0 (patch) | |
| tree | b99c4dff73df4232faeb4f015bd6be6d8b1f7f44 /kernel | |
| parent | fd4be699b5b6b1744c9b0736d991ccfb35eea575 (diff) | |
| parent | cb8da8a38015ded1df319a39b7298e69f89036ac (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
spidernet MAINTAINERship update
sky2: remove check for PCI wakeup setting from BIOS
sky2: large memory workaround.
fs_enet: check for phydev existence in the ethtool handlers
[usb netdev] asix: fix regression
r8169: fix missing loop variable increment
ip1000: menu location change
Fixed a small typo in the loopback driver
3c509: PnP resource management fix
netxen: fix byte-swapping in tx and rx
netxen: optimize tx handling
netxen: stop second phy correctly
netxen: update driver version
netxen: update MAINTAINERS
endianness noise in tulip_core
de4x5 fixes
xircom_cb endianness fixes
rt2x00: Put 802.11 data on 4 byte boundary
rt2x00: Corectly initialize rt2500usb MAC
rt2x00: Allow rt61 to catch up after a missing tx report
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions