git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e80ec84
a8c1f65
)
Merge remote branch 'wireless-next/master' into ath6kl-next
author
Kalle Valo
<kvalo@qca.qualcomm.com>
Fri, 13 Jan 2012 11:57:45 +0000
(13:57 +0200)
committer
Kalle Valo
<kvalo@qca.qualcomm.com>
Fri, 13 Jan 2012 11:57:45 +0000
(13:57 +0200)
Conflicts:
drivers/net/wireless/ath/ath6kl/usb.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff