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:
11b57f9
1e2f929
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
author
John W. Linville
<linville@tuxdriver.com>
Fri, 10 Jan 2014 15:59:40 +0000
(10:59 -0500)
committer
John W. Linville
<linville@tuxdriver.com>
Fri, 10 Jan 2014 15:59:40 +0000
(10:59 -0500)
Conflicts:
net/ieee802154/6lowpan.c
1
2
drivers/net/wireless/adm8211.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/brcm80211/brcmfmac/p2p.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/hostap/hostap_ioctl.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/ipw2x00/libipw_rx.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/ti/wl1251/main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/wl3501_cs.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/addrconf.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/iface.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/wireless/adm8211.c
Simple merge
diff --cc
drivers/net/wireless/brcm80211/brcmfmac/p2p.c
Simple merge
diff --cc
drivers/net/wireless/hostap/hostap_ioctl.c
Simple merge
diff --cc
drivers/net/wireless/ipw2x00/libipw_rx.c
Simple merge
diff --cc
drivers/net/wireless/ti/wl1251/main.c
Simple merge
diff --cc
drivers/net/wireless/wl3501_cs.c
Simple merge
diff --cc
net/ipv6/addrconf.c
Simple merge
diff --cc
net/mac80211/iface.c
Simple merge