From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 18 Jun 2014 18:39:25 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.16-rc3~20^2~21^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ee3f63d39dbebd94b4a77df04455617ce12156b;p=thirdparty%2Fkernel%2Flinux.git

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

2ee3f63d39dbebd94b4a77df04455617ce12156b