Merge branch 'wl12xx-next' into for-linville
authorLuciano Coelho <coelho@ti.com>
Fri, 8 Jun 2012 13:43:19 +0000 (16:43 +0300)
committerLuciano Coelho <coelho@ti.com>
Fri, 8 Jun 2012 13:43:19 +0000 (16:43 +0300)

Trivial merge