refs/tags/wl12xx-2012-12-11 - pub/scm/linux/kernel/git/luca/wl12xx - Git at Google

commit: 81bdc287d4cbb91d1e6a0e5cf423e645dfdc9777
[log]
author: Luciano Coelho <coelho@ti.com>
Tue Dec 11 12:38:44 2012 +0200
committer: Luciano Coelho <coelho@ti.com>
Tue Dec 11 12:38:44 2012 +0200
tree: 707a1996cc447c3ca3eb2dab317fffec077176ea
parent: f166623c77cdf4b27b7d67866bf55e9c3aef9ceb [diff]
parent: 2e07d02828759a506b5205b2cff40daa58df5bf7 [diff]

Merge branch 'wl12xx-next'

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

tree: 707a1996cc447c3ca3eb2dab317fffec077176ea