Merge branch 'wl12xx-next' into for-linville
authorLuciano Coelho <coelho@ti.com>
Mon, 25 Mar 2013 15:06:37 +0000 (17:06 +0200)
committerLuciano Coelho <coelho@ti.com>
Mon, 25 Mar 2013 15:06:37 +0000 (17:06 +0200)
1  2 
drivers/net/wireless/ti/wlcore/main.c
drivers/net/wireless/ti/wlcore/wlcore_i.h

Simple merge