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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-drv.c
This commit is contained in:
John W. Linville 2012-06-06 14:40:06 -04:00
commit 7c9c46c16d
21 changed files with 153 additions and 47 deletions