]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 338cb30) | 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>
Wed, 2 Oct 2013 14:34:55 +0000 (10:34 -0400)
commit44eb84b73ca29498dbda00edf33c8d06be7bbb61
tree1387aec7bae1d17c1cac3ccc31afdd5f872cef36tree | snapshot
parent338cb300b8f11e2a59b1c0d9d44429e0a37bccd7commit | diff
iwlwifi: pcie: fix merge damage

The merge 87fff36d seems to have lost commit 73ffd3aab,
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
Linux Kernel Source Tree.