OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
43b03f1
daf67ce
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
author
John W. Linville
<linville@tuxdriver.com>
Tue, 19 Jun 2012 18:41:22 +0000
(14:41 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Tue, 19 Jun 2012 18:41:22 +0000
(14:41 -0400)
Conflicts:
drivers/net/wireless/iwlwifi/dvm/testmode.c
drivers/net/wireless/iwlwifi/pcie/trans.c
1
2
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/pcie/trans.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/pcie/trans.c
Simple merge