Merge branch 'wl12xx-next' into for-linville
authorLuciano Coelho <coelho@ti.com>
Thu, 8 Dec 2011 11:08:10 +0000 (13:08 +0200)
committerLuciano Coelho <coelho@ti.com>
Thu, 8 Dec 2011 11:08:10 +0000 (13:08 +0200)

Trivial merge