projects / profile / ivi / kernel-x86-ivi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ec30326) | patch
iwlwifi: pcie: fix merge damage
authorJohannes Berg <johannes.berg@intel.com>
Mon, 30 Sep 2013 09:02:46 +0000 (11:02 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 7 Oct 2013 17:34:43 +0000 (13:34 -0400)
commitd107babca27f3c08e399616483e4c5f010bd24d3
tree359f12f44cf8cda7c5fb28f5561130403baf88f1tree | snapshot
parentec30326ea773900da210c495e14cfeb532550ba2commit | diff
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>
drivers/net/wireless/iwlwifi/pcie/trans.c diff | blob | history
Domain: System / Uncategorized;