From: Luciano Coelho <coelho@ti.com>
Date: Tue, 26 Jun 2012 19:43:29 +0000 (+0300)
Subject: Merge branch 'wl12xx-next' into for-linville
X-Git-Tag: firefly_0821_release~3680^2~2381^2~57^2~229
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a572ac1a3d37440dc9daf69f9ad63243bef6893f;p=firefly-linux-kernel-4.4.55.git

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

a572ac1a3d37440dc9daf69f9ad63243bef6893f