From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 27 May 2011 19:18:35 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into... 
X-Git-Tag: v3.0-rc2~7^2~16
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=11ad2f52826ac6d58d6780d3d8a3e098c88d9142;p=cascardo%2Flinux.git

Merge git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem
---

11ad2f52826ac6d58d6780d3d8a3e098c88d9142