Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	net/wireless/nl80211.c
This commit is contained in:
John W. Linville 2013-06-21 15:42:30 -04:00
commit 7d2a47aab2
210 changed files with 27577 additions and 2842 deletions