Merge v3.0.65 Conflicts: Makefile drivers/net/wireless/ath/ath9k/beacon.c drivers/net/wireless/ath/ath9k/htc_hst.c |
||
|---|---|---|
| .. | ||
| core.c | ||
| hidp.h | ||
| Kconfig | ||
| Makefile | ||
| sock.c | ||
Merge v3.0.65 Conflicts: Makefile drivers/net/wireless/ath/ath9k/beacon.c drivers/net/wireless/ath/ath9k/htc_hst.c |
||
|---|---|---|
| .. | ||
| core.c | ||
| hidp.h | ||
| Kconfig | ||
| Makefile | ||
| sock.c | ||