From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 10 Apr 2014 13:58:06 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.15-rc1~8^2~8^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=029d3ac9722d23e4f3b65656878cb3e4d9e280d4;p=users%2Fhch%2Fblock.git

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

029d3ac9722d23e4f3b65656878cb3e4d9e280d4