Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Showing
- MAINTAINERS 9 additions, 1 deletionMAINTAINERS
- drivers/net/b44.c 26 additions, 26 deletionsdrivers/net/b44.c
- drivers/net/ps3_gelic_wireless.c 8 additions, 3 deletionsdrivers/net/ps3_gelic_wireless.c
- drivers/net/wireless/b43/dma.c 14 additions, 13 deletionsdrivers/net/wireless/b43/dma.c
- drivers/net/wireless/b43legacy/dma.c 31 additions, 24 deletionsdrivers/net/wireless/b43legacy/dma.c
- drivers/net/wireless/b43legacy/main.c 2 additions, 0 deletionsdrivers/net/wireless/b43legacy/main.c
- drivers/net/wireless/rtl8187_dev.c 3 additions, 0 deletionsdrivers/net/wireless/rtl8187_dev.c
- drivers/ssb/main.c 8 additions, 6 deletionsdrivers/ssb/main.c
- include/linux/ssb/ssb.h 4 additions, 0 deletionsinclude/linux/ssb/ssb.h
- net/mac80211/rx.c 2 additions, 5 deletionsnet/mac80211/rx.c
- net/rfkill/rfkill.c 1 addition, 1 deletionnet/rfkill/rfkill.c
Loading
Please register or sign in to comment