git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bac9832
c01fac1
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
author
John W. Linville
<linville@tuxdriver.com>
Fri, 25 Jul 2014 14:22:36 +0000
(10:22 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Fri, 25 Jul 2014 14:22:36 +0000
(10:22 -0400)
Conflicts:
net/mac80211/cfg.c
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff