Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx

Conflicts:
	drivers/net/wireless/ti/wlcore/main.c
This commit is contained in:
John W. Linville 2013-01-29 14:03:20 -05:00
commit 56e1bd7706
47 changed files with 4632 additions and 2032 deletions