From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 27 Jul 2012 15:15:03 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.6-rc1~68^2^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=28ea499ac5b90f6266a24b826c6d469fc503758c;p=linux.git

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

28ea499ac5b90f6266a24b826c6d469fc503758c