Merge branch 'wl12xx-next' into for-linville
authorLuciano Coelho <coelho@ti.com>
Thu, 21 Jun 2012 14:31:46 +0000 (17:31 +0300)
committerLuciano Coelho <coelho@ti.com>
Thu, 21 Jun 2012 14:31:46 +0000 (17:31 +0300)
commitda0b1baa94a9c11448e010a150280d0834b11c32
treeeaa79e1106c91057fcabb7b7000e7ec35ab5b121
parentf761b6947dde42890beea59b020e1be87491809e
parent41844076c5c3a33636b5c26d19b16c6141c5d6cd
Merge branch 'wl12xx-next' into for-linville

Conflicts:
drivers/net/wireless/ti/wl18xx/main.c