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

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

Tue, 22 Jan 2013 20:39:51 +0000 (15:39 -0500)

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

Tue, 22 Jan 2013 20:39:51 +0000 (15:39 -0500)
author John W. Linville <linville@tuxdriver.com>
Tue, 22 Jan 2013 20:39:51 +0000 (15:39 -0500)
committer John W. Linville <linville@tuxdriver.com>
Tue, 22 Jan 2013 20:39:51 +0000 (15:39 -0500)
diff --cc drivers/net/wireless/iwlwifi/dvm/mac80211.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Tue, 22 Jan 2013 20:39:51 +0000 (15:39 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Tue, 22 Jan 2013 20:39:51 +0000 (15:39 -0500)