From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 15 May 2012 20:38:00 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.4~26^2~2^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=60374631487a6dbf6b888729022f0e8d76eec8fb;p=linux.git

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

60374631487a6dbf6b888729022f0e8d76eec8fb