git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c85251f
211c17a
)
Merge remote branch 'wireless-next/master' into ath6kl-next
author
Kalle Valo
<kvalo@qca.qualcomm.com>
Thu, 14 Jun 2012 11:20:18 +0000
(14:20 +0300)
committer
Kalle Valo
<kvalo@qca.qualcomm.com>
Thu, 14 Jun 2012 11:44:49 +0000
(14:44 +0300)
Conflicts:
drivers/net/wireless/ath/ath6kl/cfg80211.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff