Merge branch 'wl12xx-next' into for-linville

Conflicts:
	drivers/net/wireless/ti/wl12xx/main.c
	drivers/net/wireless/ti/wlcore/wlcore.h
This commit is contained in:
Luciano Coelho 2013-01-18 09:40:07 +02:00
commit 5b37649bbc
47 changed files with 4632 additions and 2032 deletions