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

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

Mon, 10 Jun 2013 18:51:17 +0000 (14:51 -0400)

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

Mon, 10 Jun 2013 18:51:17 +0000 (14:51 -0400)
author John W. Linville <linville@tuxdriver.com>
Mon, 10 Jun 2013 18:51:17 +0000 (14:51 -0400)
committer John W. Linville <linville@tuxdriver.com>
Mon, 10 Jun 2013 18:51:17 +0000 (14:51 -0400)
diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Mon, 10 Jun 2013 18:51:17 +0000 (14:51 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Mon, 10 Jun 2013 18:51:17 +0000 (14:51 -0400)