From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 16 Nov 2012 19:07:54 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=dfbebe14428803402293d9a8bf1efef7221d8b78;p=linux-edison.git

Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
---

dfbebe14428803402293d9a8bf1efef7221d8b78