From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 21 Dec 2011 18:18:22 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b4949b84567f3ae1227d076fc95bbd8efea06506;p=~shefty%2Frdma-dev.git

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

b4949b84567f3ae1227d076fc95bbd8efea06506