tree 1d43a5e0129709502edb631a4fd66de369ee5620
parent 953c96e0d85615d1ab1f100e525d376053294dc2
parent 6fe5468f452c0c40348ebd4e737758a842286ca8
author John W. Linville <linville@tuxdriver.com> 1365604767 -0400
committer John W. Linville <linville@tuxdriver.com> 1365604767 -0400

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

Conflicts:
	drivers/net/wireless/rt2x00/rt2x00pci.c
	net/mac80211/sta_info.c
	net/wireless/core.h