git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
795e936
2f24456
)
Merge branch 'wl12xx-next' into for-linville
author
Luciano Coelho
<coelho@ti.com>
Tue, 4 Dec 2012 14:39:47 +0000
(16:39 +0200)
committer
Luciano Coelho
<coelho@ti.com>
Tue, 4 Dec 2012 14:39:47 +0000
(16:39 +0200)
Conflicts:
drivers/net/wireless/ti/wlcore/main.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff