tree 9059d0fe8f2a49425edab88ea8e7d5337e13e66c
parent 7a9bc9b81a5bc6e44ebc80ef781332e4385083f2
parent 42fb0b0278e6b9a44bee8adec051de5f43e10b2b
author John W. Linville <linville@tuxdriver.com> 1340988134 -0400
committer John W. Linville <linville@tuxdriver.com> 1340988134 -0400

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/dhd_sdio.c