From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 1 Feb 2012 15:48:50 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: v3.4-rc1~177^2~112^2~358
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=874239f51f8759f3955630fa5da5cf13cd6567d5;p=linux.git

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

874239f51f8759f3955630fa5da5cf13cd6567d5