OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
89916cc
00a1f0a
)
Merge 'net-next/master'
author
Kalle Valo
<kvalo@codeaurora.org>
Sun, 6 Mar 2016 12:57:44 +0000
(14:57 +0200)
committer
Kalle Valo
<kvalo@codeaurora.org>
Sun, 6 Mar 2016 12:57:44 +0000
(14:57 +0200)
Needed by the upcoming merge of iwlwifi-next-for-kalle-2016-03-02 tag.
1
2
drivers/net/wireless/ath/ath10k/mac.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/ath/ath9k/main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/ath/wil6210/cfg80211.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/realtek/rtlwifi/core.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/wireless/ath/ath10k/mac.c
Simple merge
diff --cc
drivers/net/wireless/ath/ath9k/main.c
Simple merge
diff --cc
drivers/net/wireless/ath/wil6210/cfg80211.c
Simple merge
diff --cc
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
Simple merge
diff --cc
drivers/net/wireless/realtek/rtlwifi/core.c
Simple merge
OSDN Git Service
