From: Linus Torvalds Date: Tue, 9 May 2006 17:18:35 +0000 (-0700) Subject: Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3cd73eedde34c5fd88d62d8523c4260970fdc6fb;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'upstream' of git://git./linux/kernel/git/shemminger/netdev-2.6 * 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6: [PATCH] bcm43xx: Fix access to non-existent PHY registers [PATCH] bcm43xx: Fix array overrun in bcm43xx_geo_init [PATCH] bcm43xx: check for valid MAC address in SPROM [PATCH] ieee80211: Fix A band channel count (resent) [PATCH] bcm43xx: fix iwmode crash when down [PATCH] softmac: make non-operational after being stopped [PATCH] softmac: don't reassociate if user asked for deauthentication spidernet: enable support for bcm5461 ethernet phy spidernet: introduce new setting Fix RTL8019AS init for Toshiba RBTX49xx boards au1000_eth.c: use ether_crc() from sky2: version 1.3 Add more support for the Yukon Ultra chip found in dual core centino laptops. sky2: synchronize irq on remove sky2: dont write status ring sky2: edge triggered workaround enhancement sky2: use mask instead of modulo operation sky2: tx ring index mask fix sky2: status irq hang fix sky2: backout NAPI reschedule --- 3cd73eedde34c5fd88d62d8523c4260970fdc6fb