projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
71d9f61
3a7af58
)
Merge tag 'mac80211-for-davem-2015-05-28' of git://git.kernel.org/pub/scm/linux/kerne...
author
David S. Miller
<davem@davemloft.net>
Sun, 31 May 2015 06:37:46 +0000
(23:37 -0700)
committer
David S. Miller
<davem@davemloft.net>
Sun, 31 May 2015 06:37:46 +0000
(23:37 -0700)
Johannes Berg says:
====================
This just has a single docbook build fix. In my confusion
I'd already sent the same fix for -next, but Ben Hutchings
noted it's necessary in 4.1.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Trivial merge