]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'iwlwifi-fixes' into iwlwifi-next
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 22 Jul 2014 16:26:41 +0000 (19:26 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 22 Jul 2014 16:26:41 +0000 (19:26 +0300)
commit823c6d0fda1431d62c5d4fe646263a8ddfd8ef39
treef3021b3d4f3901e166e2bae61e41c73c88c7fd13
parent4df07771e631c585bdc0c4c1b4a9476d448798a8
parent8dcaed8aab6ba34932b8342d3c9fb20139c72f93
Merge branch 'iwlwifi-fixes' into iwlwifi-next

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c