From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 30 Sep 2013 09:02:46 +0000 (+0200)
Subject: iwlwifi: pcie: fix merge damage
X-Git-Tag: v3.12-rc7~20^2~44^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d107babca27f3c08e399616483e4c5f010bd24d3;p=pandora-kernel.git

iwlwifi: pcie: fix merge damage

The merge b35c8097 seems to have lost commit eabc4ac5d,
put the code back.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

Reading git-diff-tree failed