Merge branch 'wl12xx-next' into for-linville
authorLuciano Coelho <coelho@ti.com>
Thu, 12 Apr 2012 12:32:53 +0000 (15:32 +0300)
committerLuciano Coelho <coelho@ti.com>
Thu, 12 Apr 2012 12:32:53 +0000 (15:32 +0300)

Trivial merge