git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
660b9ca
2e07d02
)
Merge branch 'wl12xx-next' into for-linville
author
Luciano Coelho
<coelho@ti.com>
Fri, 18 Jan 2013 07:40:07 +0000
(09:40 +0200)
committer
Luciano Coelho
<coelho@ti.com>
Fri, 18 Jan 2013 07:59:08 +0000
(09:59 +0200)
Conflicts:
drivers/net/wireless/ti/wl12xx/main.c
drivers/net/wireless/ti/wlcore/wlcore.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff