projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f761b69
4184407
)
Merge branch 'wl12xx-next' into for-linville
author
Luciano Coelho
<coelho@ti.com>
Thu, 21 Jun 2012 14:31:46 +0000
(17:31 +0300)
committer
Luciano Coelho
<coelho@ti.com>
Thu, 21 Jun 2012 14:31:46 +0000
(17:31 +0300)
Conflicts:
drivers/net/wireless/ti/wl18xx/main.c
Trivial merge
projects / profile / ivi / kernel-x86-ivi.git / commitdiff