Merge branch 'wl12xx-next' into for-linville

Conflicts:
	drivers/net/wireless/ti/wl18xx/main.c
This commit is contained in:
Luciano Coelho 2012-06-21 17:31:46 +03:00
commit da0b1baa94
17 changed files with 332 additions and 109 deletions