git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
faa85aa
dc0d633
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
author
John W. Linville
<linville@tuxdriver.com>
Tue, 3 Jan 2012 20:16:34 +0000
(15:16 -0500)
committer
John W. Linville
<linville@tuxdriver.com>
Tue, 3 Jan 2012 20:16:34 +0000
(15:16 -0500)
Conflicts:
drivers/net/wireless/b43/dma.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff