From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 9 Oct 2013 15:19:05 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.12-rc7~20^2~44^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b26082b9945a9aca85d51be37824f852617c7129;p=thirdparty%2Fkernel%2Flinux.git

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

b26082b9945a9aca85d51be37824f852617c7129