projects
/
openwrt
/
staging
/
blogic.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
1
2
drivers/net/wireless/ath/ath6kl/htc.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/ath/ath6kl/init.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/ath/ath6kl/sdio.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/wireless/ath/ath6kl/htc.c
Simple merge
diff --cc
drivers/net/wireless/ath/ath6kl/init.c
Simple merge
diff --cc
drivers/net/wireless/ath/ath6kl/sdio.c
Simple merge
projects / openwrt / staging / blogic.git / commitdiff