From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 6 Jun 2014 15:59:11 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.16-rc1~27^2~50^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c6ac68a612783aab0aad62b8edd36791b251aadb;p=users%2Fwilly%2Flinux.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
---

c6ac68a612783aab0aad62b8edd36791b251aadb