]> 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)
commitf885daaf7eb74fe6c53e503b24eda07c2d80221f
tree7ee6244ea7c0be81a541d4e57783f83c4dfd7d66
parent8c16aaa8379352e1b2d587ab5a0357ae340c188f
parent9878036b9957d34dda9632c83d91bec48c9758ea
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