]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 50ab14e) | 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)
commitedaf568410c97653aa164356471f400ac8bf8bf0
tree359f12f44cf8cda7c5fb28f5561130403baf88f1tree | snapshot
parent50ab14e91636bfef611937d18dda46c1d27e6bc5commit | 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.