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)
commita373c3cec0394756f130183551214a4bd38b4103
tree19f832d10753ec06efef753cb23ec97f886f8903
parent0d4e67174b03e3dcfe75ce7ec488770a5d443bf4
parent97236a0656034ef8512ded648cfaa3d7282534e8
Merge branch 'wl12xx-next' into for-linville
drivers/net/wireless/ti/wlcore/main.c
drivers/net/wireless/ti/wlcore/wlcore_i.h