tree 266afb90f501b814c0a79f10a7afd86a6a33d631
parent f421436a591d34fa5279b54a96ac07d70250cc8d
parent 01925efdf7e03b4b803b5c9f985163d687f7f017
author John W. Linville <linville@tuxdriver.com> 1383594688 -0500
committer John W. Linville <linville@tuxdriver.com> 1383594688 -0500

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

Conflicts:
	drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h