tree 78aa3bdef892dbd1afc8969fc528e529cfc266f7
parent 56fd49e399ce1d82200fad5b8924d4e35a587809
parent 0874073570d9184a169a4ae2abbe8dbcb71878e9
author John W. Linville <linville@tuxdriver.com> 1317408736 -0400
committer John W. Linville <linville@tuxdriver.com> 1317408749 -0400

Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/wl12xx/main.c