From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 27 Sep 2011 19:47:33 +0000 (-0400)
Subject: Merge branch 'master' of git://git.infradead.org/users/linville/wireless into for... 
X-Git-Tag: v3.1-rc9~23^2^2
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=a8acfd82ebefbb32f12f413019e53f9e939cf44e;p=cascardo%2Flinux.git

Merge branch 'master' of git://git.infradead.org/users/linville/wireless into for-davem
---

a8acfd82ebefbb32f12f413019e53f9e939cf44e