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

author	John W. Linville <linville@tuxdriver.com>
	Wed, 12 Jun 2013 19:39:05 +0000 (15:39 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Wed, 12 Jun 2013 19:39:05 +0000 (15:39 -0400)
commit	812fd645968118c35a3f4d0d18dd3f4d07221df0
tree	b68ee223f22a811e9743b193872052cd264fe2d0	tree \| snapshot
parent	cb180840a0c6bff7c0787373c23cefdf20417a27	commit \| diff
parent	940d0ac9dbe3fb9d4806e96f006286c2e476deed	commit \| diff

Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next

Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c

John Crispins staging tree

drivers/net/wireless/ath/ath9k/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/cw1200/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/mvm.h	diff1 \|	diff2 \|	blob \| history