]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 02:07:56 +0000 (13:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 02:08:02 +0000 (13:08 +1100)
commit844479aac7bcbc689bb762145484e96119f10fbf
treeb3adf3f47203c4e7ef4ec42777e89ef53303fa9d
parenta4c85d2a18afb77c1a28b931ad6758fd3bc974af
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