]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Jun 2013 17:18:21 +0000 (13:18 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Jun 2013 17:18:21 +0000 (13:18 -0400)
commitcd3bd151e176a437eed7c2691f2c42499cc00d4b
tree7ee6244ea7c0be81a541d4e57783f83c4dfd7d66
parent655ba5ea25634a19f681630d96a1600e54a236d1
parentd11d95b4e885f02e0d20ef54348fc703f6718def
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
net/wireless/nl80211.c
drivers/net/wireless/ath/ath9k/htc_drv_debug.c
net/wireless/core.c
net/wireless/nl80211.c