git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e2ff049
400e020
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
author
John W. Linville
<linville@tuxdriver.com>
Wed, 21 Nov 2012 17:57:56 +0000
(12:57 -0500)
committer
John W. Linville
<linville@tuxdriver.com>
Wed, 21 Nov 2012 17:57:56 +0000
(12:57 -0500)
Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/iwlwifi/pcie/tx.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff