]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'wl12xx-next' into for-linville
authorLuciano Coelho <coelho@ti.com>
Tue, 26 Jun 2012 19:43:29 +0000 (22:43 +0300)
committerLuciano Coelho <coelho@ti.com>
Tue, 26 Jun 2012 19:43:29 +0000 (22:43 +0300)

Trivial merge