From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 9 Jan 2013 16:01:37 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.8-rc4~29^2~19
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a9b8a894ad7d0b90b0464c9ac7e8e5c1687edcae;p=linux.git

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

a9b8a894ad7d0b90b0464c9ac7e8e5c1687edcae