Merge branch 'master' into for-davem

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-testmode.c
	net/wireless/nl80211.c
This commit is contained in:
John W. Linville 2012-04-12 14:25:14 -04:00
commit 7eab0f64a9
185 changed files with 5524 additions and 3085 deletions