tree 99870656d835fc6c12093bc67517956cc7b3d6ec
parent 4153577a8d318ae02b3791341e10e78416de402f
parent 9e97d14b4923da524d202f2e005d5d30b70db9d6
author John W. Linville <linville@tuxdriver.com> 1361213233 -0500
committer John W. Linville <linville@tuxdriver.com> 1361213233 -0500

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

Conflicts:
	drivers/net/wireless/iwlwifi/dvm/tx.c
	drivers/net/wireless/ti/wlcore/sdio.c
	drivers/net/wireless/ti/wlcore/spi.c