summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-13 19:02:26 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-13 19:02:26 +0100
commitd72ec9e20e4de995aa957f171cf84b136689e4c0 (patch)
treeb99c4dff73df4232faeb4f015bd6be6d8b1f7f44 /arch
parentMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff)
parentspidernet MAINTAINERship update (diff)
downloadlinux-d72ec9e20e4de995aa957f171cf84b136689e4c0.tar.xz
linux-d72ec9e20e4de995aa957f171cf84b136689e4c0.zip
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 'arch')
0 files changed, 0 insertions, 0 deletions