projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0395442
47b6308
)
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
author
Johannes Berg
<
[email protected]
>
Tue, 18 Nov 2014 08:32:36 +0000
(09:32 +0100)
committer
Johannes Berg
<
[email protected]
>
Tue, 18 Nov 2014 08:32:44 +0000
(09:32 +0100)
This brings in some mwifiex changes that further patches will
need to work on top to not cause merge conflicts.
Signed-off-by: Johannes Berg <
[email protected]
>
Trivial merge
projects / openwrt / staging / blogic.git / commitdiff