Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (78 commits) AX.25: Fix sysctl registration if !CONFIG_AX25_DAMA_SLAVE pktgen: mac count pktgen: random flow bridge: Eliminate unnecessary forward delay bridge: fix compile warning in net/bridge/br_netfilter.c ipv4: remove unused field in struct flowi (include/net/flow.h). tg3: Fix 'scheduling while atomic' errors net: Kill plain NET_XMIT_BYPASS. net_sched: Add qdisc __NET_XMIT_BYPASS flag net_sched: Add qdisc __NET_XMIT_STOLEN flag iwl3945: fix merge mistake for packet injection iwlwifi: grap nic access before accessing periphery registers iwlwifi: decrement rx skb counter in scan abort handler iwlwifi: fix unhandled interrupt when HW rfkill is on iwlwifi: implement iwl5000_calc_rssi iwlwifi: memory allocation optimization iwlwifi: HW bug fixes p54: Fix potential concurrent access to private data rt2x00: Disable link tuning in rt2500usb iwlwifi: Don't use buffer allocated on the stack for led names ...
No related branches found
No related tags found
Showing
- drivers/net/tg3.c 4 additions, 16 deletionsdrivers/net/tg3.c
- drivers/net/wireless/Kconfig 1 addition, 0 deletionsdrivers/net/wireless/Kconfig
- drivers/net/wireless/ath5k/ath5k.h 5 additions, 3 deletionsdrivers/net/wireless/ath5k/ath5k.h
- drivers/net/wireless/ath5k/base.c 1 addition, 0 deletionsdrivers/net/wireless/ath5k/base.c
- drivers/net/wireless/ath5k/debug.c 1 addition, 1 deletiondrivers/net/wireless/ath5k/debug.c
- drivers/net/wireless/ath5k/debug.h 0 additions, 1 deletiondrivers/net/wireless/ath5k/debug.h
- drivers/net/wireless/ath5k/hw.c 149 additions, 90 deletionsdrivers/net/wireless/ath5k/hw.c
- drivers/net/wireless/ath5k/initvals.c 2 additions, 2 deletionsdrivers/net/wireless/ath5k/initvals.c
- drivers/net/wireless/ath5k/phy.c 167 additions, 18 deletionsdrivers/net/wireless/ath5k/phy.c
- drivers/net/wireless/ath5k/reg.h 695 additions, 239 deletionsdrivers/net/wireless/ath5k/reg.h
- drivers/net/wireless/ipw2200.c 3 additions, 2 deletionsdrivers/net/wireless/ipw2200.c
- drivers/net/wireless/iwlwifi/Kconfig 51 additions, 47 deletionsdrivers/net/wireless/iwlwifi/Kconfig
- drivers/net/wireless/iwlwifi/Makefile 6 additions, 7 deletionsdrivers/net/wireless/iwlwifi/Makefile
- drivers/net/wireless/iwlwifi/iwl-3945-led.c 17 additions, 16 deletionsdrivers/net/wireless/iwlwifi/iwl-3945-led.c
- drivers/net/wireless/iwlwifi/iwl-3945-led.h 1 addition, 0 deletionsdrivers/net/wireless/iwlwifi/iwl-3945-led.h
- drivers/net/wireless/iwlwifi/iwl-3945.c 9 additions, 8 deletionsdrivers/net/wireless/iwlwifi/iwl-3945.c
- drivers/net/wireless/iwlwifi/iwl-4965.c 40 additions, 116 deletionsdrivers/net/wireless/iwlwifi/iwl-4965.c
- drivers/net/wireless/iwlwifi/iwl-5000.c 64 additions, 7 deletionsdrivers/net/wireless/iwlwifi/iwl-5000.c
- drivers/net/wireless/iwlwifi/iwl-agn-rs.c 114 additions, 213 deletionsdrivers/net/wireless/iwlwifi/iwl-agn-rs.c
- drivers/net/wireless/iwlwifi/iwl-agn-rs.h 7 additions, 16 deletionsdrivers/net/wireless/iwlwifi/iwl-agn-rs.h
Loading
Please register or sign in to comment