From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 10 Aug 2012 18:05:38 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.6-rc2~15^2~5^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=039aafba1b57ed39acb3abc290c11be37402feb2;p=linux.git

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

039aafba1b57ed39acb3abc290c11be37402feb2