tree d8606a4eef8b75fe808bf5063fca68409e60c769
parent 4cd85968f8fee44ae4bb988c235defecd83b4e33
parent a1b13b9ad3759dca24c6b721ee026c540a4e6564
author John W. Linville <linville@tuxdriver.com> 1382120232 -0400
committer John W. Linville <linville@tuxdriver.com> 1382120232 -0400

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

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/drv.c