From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 29 Jun 2012 16:07:37 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: v3.6-rc1~125^2~338^2^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=42fb0b0278e6b9a44bee8adec051de5f43e10b2b;p=linux.git

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

42fb0b0278e6b9a44bee8adec051de5f43e10b2b