9bf703026650d4bc7777e6a3864d3
parent 1a8218e96271790a07dd7065a2ef173e0f67e328
parent 3b8ab88acaceb505aa06ef3bbf3a73b92470ae78
author John W. Linville <linville@tuxdriver.com> 1305572142 -0400
committer John W. Linville <linville@tuxdriver.com> 1305588739 -0400

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-tx.c
	net/mac80211/sta_info.h