]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 02:26:28 +0000 (13:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 02:26:34 +0000 (13:26 +1100)
commitfbab38f41e8f0cf595446873fd2a8bbc79feb7a3
tree71c2568f619e08c349c8ebbec82b9e6dc017d33f
parente1c6ac39a152f849a62f62503f2456e8516d3df8
parent722c9930f209dc428c1e568bd2c0f4cbd3b30dbd
Merge remote-tracking branch 'wireless/master'
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
drivers/net/wireless/brcm80211/brcmutil/utils.c
drivers/net/wireless/mwifiex/main.c
drivers/staging/Kconfig
drivers/staging/Makefile
net/mac80211/cfg.c