Merge branch 'wl12xx-next' into for-linville
authorLuciano Coelho <coelho@ti.com>
Thu, 8 Mar 2012 12:40:40 +0000 (14:40 +0200)
committerLuciano Coelho <coelho@ti.com>
Thu, 8 Mar 2012 12:40:40 +0000 (14:40 +0200)

Trivial merge