From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 21 Nov 2012 19:38:49 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~45^2~174^2^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e60896fe07307baa5f3ca1a220dfa9792657352;p=pandora-kernel.git

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

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

1e60896fe07307baa5f3ca1a220dfa9792657352
Reading git-diff-tree failed