From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 12 Apr 2012 13:55:22 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.4-rc3~32^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5d949944229b0a08e218723be231731cd86b94f3;p=linux.git

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

5d949944229b0a08e218723be231731cd86b94f3