OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
94e92a7
8f9c98d
)
Merge tag 'mac80211-next-for-davem-2015-08-14' mac80211-next.git
author
Kalle Valo
<kvalo@codeaurora.org>
Tue, 18 Aug 2015 05:44:22 +0000
(08:44 +0300)
committer
Kalle Valo
<kvalo@codeaurora.org>
Tue, 18 Aug 2015 05:44:22 +0000
(08:44 +0300)
iwlwifi needs new mac80211 patches so merge mac80211-next.git to
wireless-drivers-next.git.
1
2
drivers/net/wireless/iwlwifi/dvm/dev.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/dvm/rx.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/mvm/mvm.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/mvm/ops.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/mvm/rx.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/mvm/sta.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/wireless/iwlwifi/dvm/dev.h
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/dvm/rx.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/mvm/mvm.h
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/mvm/ops.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/mvm/rx.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/mvm/sta.c
Simple merge