]> 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)
commit5d20be1f9e3a07bec2648977f6b4011391e7a551
tree8fe7d740f4e8d08a4159a710dd5c6cdc15a85c16
parentf110aa50a918a79d3aeddff65166dfc0993c9187
parent42c38703f3d3fb62ce3adedddbe0aabb5c77bc1f
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