]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote branch 'wireless-next/master' into ath6kl-next
authorKalle Valo <kvalo@qca.qualcomm.com>
Mon, 5 Mar 2012 17:32:58 +0000 (19:32 +0200)
committerKalle Valo <kvalo@qca.qualcomm.com>
Mon, 5 Mar 2012 17:32:58 +0000 (19:32 +0200)
commit61497a1dc975ee830ba41de0cde6a39d5b1f199c
treea54c90523b72fb6e61b7bfe01fb8917e16825781
parent6f9b4725c0b44db7167e5d05589f2159b51ec364
parent4a72a7bb87a2fda020bf619e8ee17f2b2111fe82
Merge remote branch 'wireless-next/master' into ath6kl-next

Conflicts:
drivers/net/wireless/ath/ath6kl/cfg80211.c
drivers/net/wireless/ath/ath6kl/cfg80211.c