Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

Conflicts:
	drivers/net/wireless/iwlwifi/Kconfig
This commit is contained in:
Emmanuel Grumbach 2015-05-26 19:20:34 +03:00
commit 04c9599d1a
10 changed files with 65 additions and 28 deletions