tree d8d2431f21d4371c907dec075926e86840e86d1e
parent c14c5d99a453af6b86f15aca8fe9005b2b8f3b26
parent adb07df1e039e9fe43e66aeea8b4771f83659dbb
author John W. Linville <linville@tuxdriver.com> 1393956312 -0500
committer John W. Linville <linville@tuxdriver.com> 1393956312 -0500

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

Conflicts:
	drivers/net/wireless/ath/ath9k/recv.c
	drivers/net/wireless/mwifiex/pcie.c