tree 2cbf6915ea069ada4e3e1bca0b91b12e06500681
parent ba5736a5e9ac20c378ae4179e8a0ed3cc4b44351
parent 9995ffe5f5fdddcc73e4465cc3f8b38714df8108
author John W. Linville <linville@tuxdriver.com> 1322858643 -0500
committer John W. Linville <linville@tuxdriver.com> 1322858643 -0500

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

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