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

author John W. Linville <[email protected]>

Fri, 14 Mar 2014 18:33:19 +0000 (14:33 -0400)

committer John W. Linville <[email protected]>

Fri, 14 Mar 2014 18:33:19 +0000 (14:33 -0400)
author John W. Linville <[email protected]>
Fri, 14 Mar 2014 18:33:19 +0000 (14:33 -0400)
committer John W. Linville <[email protected]>
Fri, 14 Mar 2014 18:33:19 +0000 (14:33 -0400)
diff --cc drivers/net/wireless/iwlwifi/mvm/bt-coex.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/pcie/drv.c
Simple merge
author	John W. Linville <[email protected]>
	Fri, 14 Mar 2014 18:33:19 +0000 (14:33 -0400)
committer	John W. Linville <[email protected]>
	Fri, 14 Mar 2014 18:33:19 +0000 (14:33 -0400)
		1	2
drivers/net/wireless/iwlwifi/mvm/bt-coex.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/drv.c	patch \|	diff1 \|	diff2 \|	blob \| history