tree 81af47abc50641f911e3b5833850357a48a82be8
parent cd32984f64cb4fdd84e33f30da1f10582fc43cbf
parent ba54238552625aad2d75f455a4d3db18ea7dec68
author John W. Linville <linville@tuxdriver.com> 1317220089 -0400
committer John W. Linville <linville@tuxdriver.com> 1317220089 -0400

Merge branch 'master' of git://git.infradead.org/users/linville/wireless

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-scan.c
	net/wireless/nl80211.c