Merge branch 'wl12xx-next' into for-linville
authorLuciano Coelho <coelho@ti.com>
Wed, 14 Sep 2011 08:32:15 +0000 (11:32 +0300)
committerLuciano Coelho <coelho@ti.com>
Wed, 14 Sep 2011 08:32:15 +0000 (11:32 +0300)

Trivial merge