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)
commit916ef361ce70a56601654e44c91855153e557051
treeea2812e64d17e2bf93a65e5a1933d54ff0e07255
parente66a8ddff72e85605f2212a0ebc666c7e9116641
parent6bac40a63aae9d0942496c9f350dbb7a6c88e3fa
Merge branch 'wl12xx-next' into for-linville
drivers/net/wireless/ti/wlcore/main.c