Merge branch 'wl12xx-next' into for-linville
authorLuciano Coelho <coelho@ti.com>
Tue, 4 Dec 2012 14:39:47 +0000 (16:39 +0200)
committerLuciano Coelho <coelho@ti.com>
Tue, 4 Dec 2012 14:39:47 +0000 (16:39 +0200)
commitaaabee8b7686dfe49f10289cb4b7a817b99e5dd9
tree7ccc6cf829a93d46daf484164a5466c91eca2efa
parent795e9364215dc98b1dea888ebae22383ecbbb92a
parent2f24456149110f4d9f0547429f1249d40143561d
Merge branch 'wl12xx-next' into for-linville

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