tree 05220b08a0c9d170ad88e3b9ed0390750d22d8ea
parent 8b1fdb53075bd794a209a611bc94aedaf7ecf9e2
parent 78feb35b8161acd95c33a703ed6ab6f554d29387
author John W. Linville <linville@tuxdriver.com> 1323891341 -0500
committer John W. Linville <linville@tuxdriver.com> 1323891341 -0500

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c