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: [PATCH] Kconfig: remove redundant NETDEVICES depends [PATCH] ehea: 64K page support fix [PATCH] ehea: Removed redundant define [PATCH] ehea: Nullpointer dereferencation fix [PATCH] bcm43xx: fix unexpected LED control values in BCM4303 sprom [PATCH] bcm43xx: Fix low-traffic netdev watchdog TX timeouts [PATCH] hostap_plx: fix CIS verification [PATCH] ieee80211: don't flood log with errors
No related branches found
No related tags found
Showing
- drivers/net/Kconfig 2 additions, 2 deletionsdrivers/net/Kconfig
- drivers/net/ehea/ehea.h 1 addition, 4 deletionsdrivers/net/ehea/ehea.h
- drivers/net/ehea/ehea_ethtool.c 1 addition, 1 deletiondrivers/net/ehea/ehea_ethtool.c
- drivers/net/ehea/ehea_main.c 13 additions, 13 deletionsdrivers/net/ehea/ehea_main.c
- drivers/net/ehea/ehea_phyp.c 1 addition, 1 deletiondrivers/net/ehea/ehea_phyp.c
- drivers/net/ehea/ehea_phyp.h 4 additions, 2 deletionsdrivers/net/ehea/ehea_phyp.h
- drivers/net/ehea/ehea_qmr.c 9 additions, 8 deletionsdrivers/net/ehea/ehea_qmr.c
- drivers/net/wireless/bcm43xx/bcm43xx_leds.c 6 additions, 1 deletiondrivers/net/wireless/bcm43xx/bcm43xx_leds.c
- drivers/net/wireless/bcm43xx/bcm43xx_leds.h 6 additions, 0 deletionsdrivers/net/wireless/bcm43xx/bcm43xx_leds.h
- drivers/net/wireless/bcm43xx/bcm43xx_main.c 15 additions, 1 deletiondrivers/net/wireless/bcm43xx/bcm43xx_main.c
- drivers/net/wireless/hostap/hostap_plx.c 2 additions, 2 deletionsdrivers/net/wireless/hostap/hostap_plx.c
- net/ieee80211/ieee80211_rx.c 6 additions, 6 deletionsnet/ieee80211/ieee80211_rx.c
Loading
Please register or sign in to comment