projects
/
GitHub
/
LineageOS
/
G12
/
android_kernel_amlogic_linux-4.9.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c47af22
dc271ee
)
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
author
Emmanuel Grumbach
<emmanuel.grumbach@intel.com>
Sun, 6 Jul 2014 08:15:23 +0000
(11:15 +0300)
committer
Emmanuel Grumbach
<emmanuel.grumbach@intel.com>
Sun, 6 Jul 2014 08:15:23 +0000
(11:15 +0300)
1
2
drivers/net/wireless/iwlwifi/iwl-fw.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/mvm/mac80211.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/wireless/iwlwifi/iwl-fw.h
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge