From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 3 Mar 2014 19:34:45 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.14-rc6~30^2~1^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0c6a4812a0e1879daa6c8ac88e566dbb85e1ea70;p=linux.git

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

0c6a4812a0e1879daa6c8ac88e566dbb85e1ea70