projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
22c5649
dcf3396
)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
author
John W. Linville
<linville@tuxdriver.com>
Tue, 21 Aug 2012 20:00:21 +0000
(16:00 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Tue, 21 Aug 2012 20:00:21 +0000
(16:00 -0400)
Conflicts:
drivers/net/wireless/mac80211_hwsim.c
1
2
drivers/net/wireless/ath/ath5k/mac80211-ops.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/b43/main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/b43legacy/main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/mac80211_hwsim.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/mesh.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/mesh.h
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/mesh_plink.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/wireless/ath/ath5k/mac80211-ops.c
Simple merge
diff --cc
drivers/net/wireless/b43/main.c
Simple merge
diff --cc
drivers/net/wireless/b43legacy/main.c
Simple merge
diff --cc
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
Simple merge
diff --cc
drivers/net/wireless/mac80211_hwsim.c
Simple merge
diff --cc
net/mac80211/mesh.c
Simple merge
diff --cc
net/mac80211/mesh.h
Simple merge
diff --cc
net/mac80211/mesh_plink.c
Simple merge