Merge branch 'for-davem' of...
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 Conflicts: drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
Showing
- Documentation/DocBook/80211.tmpl 68 additions, 2 deletionsDocumentation/DocBook/80211.tmpl
- drivers/net/wireless/ath/ar9170/usb.c 2 additions, 4 deletionsdrivers/net/wireless/ath/ar9170/usb.c
- drivers/net/wireless/ath/ath.h 2 additions, 0 deletionsdrivers/net/wireless/ath/ath.h
- drivers/net/wireless/ath/ath5k/Kconfig 16 additions, 1 deletiondrivers/net/wireless/ath/ath5k/Kconfig
- drivers/net/wireless/ath/ath5k/Makefile 2 additions, 0 deletionsdrivers/net/wireless/ath/ath5k/Makefile
- drivers/net/wireless/ath/ath5k/ahb.c 219 additions, 0 deletionsdrivers/net/wireless/ath/ath5k/ahb.c
- drivers/net/wireless/ath/ath5k/ani.c 3 additions, 3 deletionsdrivers/net/wireless/ath/ath5k/ani.c
- drivers/net/wireless/ath/ath5k/ath5k.h 173 additions, 87 deletionsdrivers/net/wireless/ath/ath5k/ath5k.h
- drivers/net/wireless/ath/ath5k/attach.c 15 additions, 13 deletionsdrivers/net/wireless/ath/ath5k/attach.c
- drivers/net/wireless/ath/ath5k/base.c 274 additions, 479 deletionsdrivers/net/wireless/ath/ath5k/base.c
- drivers/net/wireless/ath/ath5k/base.h 4 additions, 1 deletiondrivers/net/wireless/ath/ath5k/base.h
- drivers/net/wireless/ath/ath5k/caps.c 0 additions, 6 deletionsdrivers/net/wireless/ath/ath5k/caps.c
- drivers/net/wireless/ath/ath5k/debug.c 1 addition, 0 deletionsdrivers/net/wireless/ath/ath5k/debug.c
- drivers/net/wireless/ath/ath5k/debug.h 2 additions, 0 deletionsdrivers/net/wireless/ath/ath5k/debug.h
- drivers/net/wireless/ath/ath5k/desc.c 18 additions, 6 deletionsdrivers/net/wireless/ath/ath5k/desc.c
- drivers/net/wireless/ath/ath5k/dma.c 168 additions, 12 deletionsdrivers/net/wireless/ath/ath5k/dma.c
- drivers/net/wireless/ath/ath5k/eeprom.c 55 additions, 72 deletionsdrivers/net/wireless/ath/ath5k/eeprom.c
- drivers/net/wireless/ath/ath5k/eeprom.h 1 addition, 1 deletiondrivers/net/wireless/ath/ath5k/eeprom.h
- drivers/net/wireless/ath/ath5k/initvals.c 213 additions, 196 deletionsdrivers/net/wireless/ath/ath5k/initvals.c
- drivers/net/wireless/ath/ath5k/led.c 10 additions, 1 deletiondrivers/net/wireless/ath/ath5k/led.c
Loading
Please register or sign in to comment