tree 5a41c0f766143e462bfde8515ca6547d4ee7f78e
parent c43933e61ea9b630521bf0d5cf06c155478308a7
parent f09a878511997c25a76bf111a32f6b8345a701a5
author John W. Linville <linville@tuxdriver.com> 1366740579 -0400
committer John W. Linville <linville@tuxdriver.com> 1366740579 -0400

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
	drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c