git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
251c9ba
a59b40b
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
author
John W. Linville
<linville@tuxdriver.com>
Fri, 6 Dec 2013 14:50:45 +0000
(09:50 -0500)
committer
John W. Linville
<linville@tuxdriver.com>
Fri, 6 Dec 2013 14:50:45 +0000
(09:50 -0500)
Conflicts:
drivers/net/wireless/brcm80211/Kconfig
net/mac80211/util.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff