From: Luciano Coelho <coelho@ti.com>
Date: Fri, 8 Jun 2012 13:43:19 +0000 (+0300)
Subject: Merge branch 'wl12xx-next' into for-linville
X-Git-Tag: v3.6-rc1~125^2~559^2~8
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=bf34e68352ac9f8deae3e78c2825ac9fe373e73e;p=linux.git

Merge branch 'wl12xx-next' into for-linville
---

bf34e68352ac9f8deae3e78c2825ac9fe373e73e