]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: af5520e) | 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)
commit251d259d9c3f7ca9103c2cf7b172b6caf92eb29f
tree1387aec7bae1d17c1cac3ccc31afdd5f872cef36tree | snapshot
parentaf5520e9a04e993a52b207fd63ac30146d789a1dcommit | diff
iwlwifi: pcie: fix merge damage

The merge 8d61bd11 seems to have lost commit 8dab16418,
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.