tree 4dba9e4da9ad99a73251b4b0563f910f727894fb
parent fdbfff73408f99799724f583cbc2a0ce3263c6a7
parent 2d4524ac18a3965051f6279aff5e9b1d72ac9d7f
author John W. Linville <linville@tuxdriver.com> 1339008006 -0400
committer John W. Linville <linville@tuxdriver.com> 1339008006 -0400

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

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