From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 7 Sep 2012 19:07:55 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fac805f8c198092de9a2842efd7f5022e2937b18;p=~shefty%2Frdma-dev.git

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

fac805f8c198092de9a2842efd7f5022e2937b18