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

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

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/internal.h
This commit is contained in:
Emmanuel Grumbach 2015-08-04 21:30:10 +03:00
commit d4a8169854
12 changed files with 176 additions and 416 deletions