Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 15 May 2014 14:24:28 +0000 (10:24 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 15 May 2014 14:24:28 +0000 (10:24 -0400)
commit025a58fd9d5785d63c398e96ac543db2639c7ddc
treef15063ac321fb1d13e35bc75c70e7cee81aa3119
parente84d2f8d2ae33c8215429824e1ecf24cbca9645e
parentfaf1dc64e345ac4de5c4429df6ed492255ae2248
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem