]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD
authorJohannes Berg <johannes.berg@intel.com>
Mon, 27 May 2013 11:30:49 +0000 (13:30 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 27 May 2013 11:30:49 +0000 (13:30 +0200)
commitea9b4ac9a44cf2400119d878b3d1c1276255a680
tree8fe7d740f4e8d08a4159a710dd5c6cdc15a85c16
parentc17877e0c7ab7ee400589cdc8cf79046d9536b4c
parentbe214e7221d0ba4b5a4a0e2ac3cbe67def32f7a6
Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD

Conflicts:
drivers/net/wireless/iwlwifi/mvm/ops.c
drivers/net/wireless/iwlwifi/mvm/fw-api.h
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/mvm.h
drivers/net/wireless/iwlwifi/mvm/ops.c