tree 8fe7d740f4e8d08a4159a710dd5c6cdc15a85c16
parent 071d4990fd9fe6fe27b47f1587ba11db3111c3fd
parent a87783699b23395c46bbeeb5d28f6db24897bf26
author Johannes Berg <johannes.berg@intel.com> 1369654249 +0200
committer Johannes Berg <johannes.berg@intel.com> 1369654249 +0200

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

Conflicts:
	drivers/net/wireless/iwlwifi/mvm/ops.c