]> git.baikalelectronics.ru Git - kernel.git/commit
iwlwifi: mvm: fix merge damage
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 6 Jul 2014 09:51:22 +0000 (12:51 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 6 Jul 2014 09:51:22 +0000 (12:51 +0300)
commit8af068fe8da9d9fc03a900f9676e7ebaf75e46a4
treea5722e475bebeb434eccc54b43175b56b5445dd7
parentbd8f1228036a21ec1d11d5230b59f41d53540ded
iwlwifi: mvm: fix merge damage

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