Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...

author John W. Linville <linville@tuxdriver.com>

Tue, 12 Feb 2013 16:06:52 +0000 (11:06 -0500)

committer John W. Linville <linville@tuxdriver.com>

Tue, 12 Feb 2013 16:06:52 +0000 (11:06 -0500)
author John W. Linville <linville@tuxdriver.com>
Tue, 12 Feb 2013 16:06:52 +0000 (11:06 -0500)
committer John W. Linville <linville@tuxdriver.com>
Tue, 12 Feb 2013 16:06:52 +0000 (11:06 -0500)
diff --cc drivers/net/wireless/ath/ath6kl/cfg80211.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Tue, 12 Feb 2013 16:06:52 +0000 (11:06 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Tue, 12 Feb 2013 16:06:52 +0000 (11:06 -0500)