Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/tx.c
This commit is contained in:
John W. Linville 2012-11-28 10:56:03 -05:00
commit 79d38f7d6c
289 changed files with 27506 additions and 8374 deletions