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)
commit57ed5cd695d7373b8ae0ae9f10fe945e774d58f0
tree7ee6244ea7c0be81a541d4e57783f83c4dfd7d66
parent5e6700b3bf98fe98d630bf9c939ad4c85ce95592
parent0f817ed52d07873cd39c9d3f6d87fae962dc742f
Merge branch 'master' of git://git./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