From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 22 May 2012 19:18:06 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
X-Git-Tag: for-linus-20120531~76^2~6^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a0d0d1685f9763ab26a394df3ab84026b39a06a7;p=linux-block.git

Merge git://git./linux/kernel/git/linville/wireless-next
---

a0d0d1685f9763ab26a394df3ab84026b39a06a7