git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7a9bc9b 42fb0b0)

author	John W. Linville <linville@tuxdriver.com>
	Fri, 29 Jun 2012 16:42:14 +0000 (12:42 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 29 Jun 2012 16:42:14 +0000 (12:42 -0400)
commit	8732baafc3f19e69df683c3f0f36c13cec746fb9
tree	9059d0fe8f2a49425edab88ea8e7d5337e13e66c	tree \| snapshot
parent	7a9bc9b81a5bc6e44ebc80ef781332e4385083f2	commit \| diff
parent	42fb0b0278e6b9a44bee8adec051de5f43e10b2b	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

13 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/sta_cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/sta_cmdresp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/cam.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ti/wlcore/tx.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree