d24fb0833739576c5e92f
parent faa85aa24286a9e14ae7cc797352350c3ac39986
parent dc0d633e35643662f27a0b1c531da3cd6b204b9c
author John W. Linville <linville@tuxdriver.com> 1325621794 -0500
committer John W. Linville <linville@tuxdriver.com> 1325621794 -0500

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

Conflicts:
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c